Map various obfuscated names (#253)

* Map various obfuscated names
* "active" actually had more uses as opposed to "enabled", so that's what it's going to be
* Chunk -> WorldChunk, IChunk -> Chunk

mappings/bai.mapping

@@ -1,5 +1,6 @@
 CLASS bai
 	METHOD b getBlockState (Let;)Lbom;
+		ARG 1 pos
 	METHOD c getFluidState (Let;)Lcdz;
 		ARG 0 pos
 	METHOD f getBlockEntity (Let;)Lbmq;

mappings/bpz.mapping

@@ -1,13 +0,0 @@
-CLASS bpz
-	METHOD a addEntity (Lagk;)V
-	METHOD a setBlockEntity (Let;Lbmq;)V
-		ARG 1 pos
-	METHOD a setBlockState (Let;Lbom;Z)Lbom;
-		ARG 1 pos
-		ARG 2 state
-	METHOD a addPendingBlockEntityTag (Lhq;)V
-	METHOD d getSectionArray ()[Lbqm;
-	METHOD d removeBlockEntity (Let;)V
-	METHOD e markBlockForPostProcessing (Let;)V
-	METHOD g getPos ()Lbag;
-	METHOD i getBiomeArray ()[Lbbr;

mappings/bqt.mapping

@@ -1,12 +1,15 @@
 CLASS bqt
 	METHOD a addEntity (Lagk;)V
+		ARG 1 entity
 	METHOD a setBlockEntity (Let;Lbmq;)V
 		ARG 1 pos
+		ARG 2 blockEntity
 	METHOD a setBlockState (Let;Lbom;Z)Lbom;
 		ARG 1 pos
 		ARG 2 state
 	METHOD a addPendingBlockEntityTag (Lhq;)V
 	METHOD b getBlockState (Let;)Lbom;
+		ARG 1 pos
 	METHOD c getFluidState (Let;)Lcdz;
 		ARG 0 pos
 	METHOD d getSectionArray ()[Lbqm;
@@ -16,3 +19,5 @@ CLASS bqt
 		ARG 0 pos
 	METHOD g getPos ()Lbag;
 	METHOD i getBiomeArray ()[Lbbr;
+	METHOD j getLuminance (Let;)I
+		ARG 1 pos

mappings/crg.mapping

@@ -1,13 +1,16 @@
 CLASS crg
 	METHOD a mouseScrolled (D)Z
+		ARG 1 dY
 	METHOD a mouseClicked (DDI)Z
 		ARG 0 mouseX
 		ARG 1 mouseX
 		ARG 2 keyCode
 		ARG 3 mouseY
+		ARG 5 button
 	METHOD a mouseDragged (DDIDD)Z
 		ARG 1 mouseX
 		ARG 3 mouseY
+		ARG 5 button
 	METHOD a isSelected (I)Z
 		ARG 0 index
 	METHOD a drawEntries (IIIIF)V
@@ -19,6 +22,8 @@ CLASS crg
 		ARG 0 mouseX
 		ARG 1 mouseX
 		ARG 2 keyCode
+		ARG 3 mouseY
+		ARG 5 button
 	METHOD c width ()I
 	METHOD d getEntryCount ()I
 	METHOD f getScrollbarPosition ()I

mappings/cri.mapping

@@ -1,13 +1,16 @@
 CLASS cri
 	METHOD a mouseScrolled (D)Z
+		ARG 1 dY
 	METHOD a mouseClicked (DDI)Z
 		ARG 0 mouseX
 		ARG 1 mouseX
 		ARG 2 keyCode
 		ARG 3 mouseY
+		ARG 5 button
 	METHOD a mouseDragged (DDIDD)Z
 		ARG 1 mouseX
 		ARG 3 mouseY
+		ARG 5 button
 	METHOD a isSelected (I)Z
 		ARG 0 index
 	METHOD a drawEntry (IIIIIIF)V
@@ -18,6 +21,8 @@ CLASS cri
 		ARG 0 mouseX
 		ARG 1 mouseX
 		ARG 2 keyCode
+		ARG 3 mouseY
+		ARG 5 button
 	METHOD c getWidth ()I
 	METHOD d getEntryCount ()I
 	METHOD f getScrollbarPosition ()I

mappings/crj.mapping

@@ -1,13 +1,16 @@
 CLASS crj
 	METHOD a mouseScrolled (D)Z
+		ARG 1 dY
 	METHOD a mouseClicked (DDI)Z
 		ARG 0 mouseX
 		ARG 1 mouseX
 		ARG 2 keyCode
 		ARG 3 mouseY
+		ARG 5 button
 	METHOD a mouseDragged (DDIDD)Z
 		ARG 1 mouseX
 		ARG 3 mouseY
+		ARG 5 button
 	METHOD a isSelected (I)Z
 		ARG 0 index
 	METHOD a draw (IIF)V
@@ -21,6 +24,8 @@ CLASS crj
 		ARG 0 mouseX
 		ARG 1 mouseX
 		ARG 2 keyCode
+		ARG 3 mouseY
+		ARG 5 button
 	METHOD c getWidth ()I
 	METHOD d getEntryCount ()I
 	METHOD f getScrollbarPosition ()I

mappings/crt.mapping

@@ -23,3 +23,4 @@ CLASS crt
 		ARG 1 mouseX
 		ARG 2 mouseY
 	METHOD c onInitialized ()V
+	METHOD getFocused ()Lcqb;

mappings/cuq.mapping

@@ -9,3 +9,4 @@ CLASS cuq
 		ARG 1 mouseX
 		ARG 2 keyCode
 		ARG 3 mouseY
+		ARG 5 button

mappings/cuu.mapping

@@ -4,6 +4,7 @@ CLASS cuu
 		ARG 1 mouseX
 		ARG 2 keyCode
 		ARG 3 mouseY
+		ARG 5 button
 	METHOD a draw (IIF)V
 		ARG 0 mouseX
 		ARG 1 mouseY

mappings/cvb.mapping

@@ -4,4 +4,5 @@ CLASS cvb
 		ARG 1 mouseX
 		ARG 2 keyCode
 		ARG 3 mouseY
+		ARG 5 button
 	METHOD a drawEntry (IIIIZF)V

mappings/dfh.mapping

@@ -2,6 +2,7 @@ CLASS dfh
 	METHOD a getLightLevel (Lbbd;Let;)I
 		ARG 1 type
 	METHOD b getBlockState (Let;)Lbom;
+		ARG 1 pos
 	METHOD c getFluidState (Let;)Lcdz;
 		ARG 0 pos
 	METHOD e getBiome (Let;)Lbbr;

mappings/dmh.mapping

@@ -1,3 +0,0 @@
-CLASS dmh
-	METHOD a findFile (Ljava/lang/String;)Ljava/io/File;
-	METHOD a getResource (Lpz;)Ljava/io/File;

mappings/net/minecraft/client/MinecraftClient.mapping

@@ -89,6 +89,7 @@ CLASS cof net/minecraft/client/MinecraftClient
 	METHOD W getItemRenderer ()Ldhx;
 	METHOD X getFirstPersonRenderer ()Ldco;
 	METHOD Y getCurrentFps ()I
+	METHOD Z getMetricsData ()Lyi;
 	METHOD a onResolutionChanged ()V
 	METHOD a addSnooperInfo (Lafn;)V
 	METHOD a setCameraEntity (Lagk;)V
@@ -138,6 +139,7 @@ CLASS cof net/minecraft/client/MinecraftClient
 	METHOD e getVersionType ()Ljava/lang/String;
 	METHOD f forcesUnicodeFont ()Z
 	METHOD g reloadResources ()V
+	METHOD getFocused ()Lcqb;
 	METHOD h getLevelStorage ()Lchg;
 	METHOD i stop ()V
 	METHOD k stopThread ()V

mappings/net/minecraft/client/MinecraftClientGame.mapping

@@ -1,3 +1,27 @@
 CLASS coa net/minecraft/client/MinecraftClientGame
+	CLASS coa$a PerformanceMetricsImpl
+		FIELD a minTime I
+		FIELD b maxTime I
+		FIELD c averageTime I
+		FIELD d sampleCount I
+		METHOD <init> (IIII)V
+			ARG 1 minTime
+			ARG 2 maxTime
+			ARG 3 averageTime
+			ARG 4 sampleCount
 	FIELD a client Lcof;
 	FIELD b launcher Lcom/mojang/bridge/launcher/Launcher;
+	FIELD c listener Lcom/mojang/bridge/launcher/SessionEventListener;
+	METHOD <init> (Lcof;)V
+		ARG 1 client
+	METHOD a onStartGameSession ()V
+	METHOD b onLeaveGameSession ()V
+	METHOD getCurrentSession ()Lcom/mojang/bridge/game/GameSession;
+		ARG 1 world
+	METHOD getPerformanceMetrics ()Lcom/mojang/bridge/game/PerformanceMetrics;
+		ARG 1 metricsData
+		ARG 2 minTime
+		ARG 4 maxTime
+		ARG 6 totalTime
+	METHOD setSessionEventListener (Lcom/mojang/bridge/launcher/SessionEventListener;)V
+		ARG 1 listener

mappings/net/minecraft/client/RunArgs.mapping

@@ -4,20 +4,41 @@ CLASS cwb net/minecraft/client/RunArgs
 		FIELD b resourcePackDir Ljava/io/File;
 		FIELD c assetDir Ljava/io/File;
 		FIELD d assetIndex Ljava/lang/String;
+		METHOD <init> (Ljava/io/File;Ljava/io/File;Ljava/io/File;Ljava/lang/String;)V
+			ARG 1 runDir
+			ARG 2 resPackDir
+			ARG 3 assetDir
+			ARG 4 assetIndex
 		METHOD a getResourceIndex ()Ldmd;
 	CLASS cwb$b Game
 		FIELD a demo Z
 		FIELD b version Ljava/lang/String;
 		FIELD c versionType Ljava/lang/String;
+		METHOD <init> (ZLjava/lang/String;Ljava/lang/String;)V
+			ARG 1 demo
+			ARG 2 version
+			ARG 3 versionType
 	CLASS cwb$c AutoConnect
-		FIELD a serverIp Ljava/lang/String;
+		FIELD a serverIP Ljava/lang/String;
 		FIELD b serverPort I
+		METHOD <init> (Ljava/lang/String;I)V
+			ARG 1 serverIP
+			ARG 2 serverPort
 	CLASS cwb$d Network
 		FIELD a session Lcom;
 		FIELD c profileProperties Lcom/mojang/authlib/properties/PropertyMap;
 		FIELD d netProxy Ljava/net/Proxy;
+		METHOD <init> (Lcom;Lcom/mojang/authlib/properties/PropertyMap;Lcom/mojang/authlib/properties/PropertyMap;Ljava/net/Proxy;)V
+			ARG 1 session
+			ARG 4 proxy
 	FIELD a network Lcwb$d;
-	FIELD b render Lcmq;
+	FIELD b windowSettings Lcmq;
 	FIELD c directories Lcwb$a;
 	FIELD d game Lcwb$b;
 	FIELD e autoConnect Lcwb$c;
+	METHOD <init> (Lcwb$d;Lcmq;Lcwb$a;Lcwb$b;Lcwb$c;)V
+		ARG 1 network
+		ARG 2 windowSettings
+		ARG 3 dirs
+		ARG 4 game
+		ARG 5 autoConnect

mappings/net/minecraft/client/WindowSettings.mapping

@@ -0,0 +1,12 @@
+CLASS cmq net/minecraft/client/WindowSettings
+	FIELD a width I
+	FIELD b height I
+	FIELD c fullscreenWidth Ljava/util/Optional;
+	FIELD d fullscreenHeight Ljava/util/Optional;
+	FIELD e fullscreen Z
+	METHOD <init> (IILjava/util/Optional;Ljava/util/Optional;Z)V
+		ARG 1 width
+		ARG 2 height
+		ARG 3 fullscreenWidth
+		ARG 4 fullscreenHeight
+		ARG 5 fullscreen

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

@@ -17,11 +17,13 @@ CLASS ctf net/minecraft/client/gui/AbstractCommandBlockGui
 	FIELD h cancelButton Lcpe;
 	FIELD i toggleTrackingOutputButton Lcpe;
 	METHOD a mouseScrolled (D)Z
+		ARG 1 dY
 	METHOD a mouseClicked (DDI)Z
 		ARG 0 mouseX
 		ARG 1 mouseX
 		ARG 2 keyCode
 		ARG 3 mouseY
+		ARG 5 button
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY

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

@@ -14,9 +14,11 @@ CLASS ctg net/minecraft/client/gui/ContainerGui
 		ARG 1 mouseX
 		ARG 2 keyCode
 		ARG 3 mouseY
+		ARG 5 button
 	METHOD a mouseDragged (DDIDD)Z
 		ARG 1 mouseX
 		ARG 3 mouseY
+		ARG 5 button
 	METHOD a isClickInContainerBounds (DDIII)Z
 		ARG 1 mouseX
 		ARG 3 mouseY
@@ -53,6 +55,8 @@ CLASS ctg net/minecraft/client/gui/ContainerGui
 		ARG 0 mouseX
 		ARG 1 mouseX
 		ARG 2 keyCode
+		ARG 3 mouseY
+		ARG 5 button
 	METHOD b drawMousoverTooltip (II)V
 		ARG 1 mouseX
 	METHOD c onInitialized ()V

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

@@ -1,4 +1,4 @@
-CLASS cqa
+CLASS cqa net/minecraft/client/gui/DrawableContainer
 	FIELD a focused Lcqb;
 	FIELD f active Z
 	METHOD a isActive ()Z
@@ -7,19 +7,37 @@ CLASS cqa
 		ARG 1 mouseX
 		ARG 2 keyCode
 		ARG 3 mouseY
+		ARG 5 button
+		ARG 8 result
 	METHOD a mouseDragged (DDIDD)Z
 		ARG 1 mouseX
 		ARG 3 mouseY
+		ARG 5 button
+	METHOD a getNextFocusable (I)Lcqb;
+		ARG 1 startIndex
+		ARG 2 listeners
+		ARG 5 listener
 	METHOD a keyPressed (III)Z
 		ARG 1 keyCode
 		ARG 2 scanCode
 	METHOD a setFocused (Lcqb;)V
+		ARG 1 listener
 	METHOD a switchFocus (Lcqb;I)V
+		ARG 1 listever
+		ARG 2 prevFocus
+		ARG 3 listener
 	METHOD b getListeners ()Ljava/util/List;
 	METHOD b mouseReleased (DDI)Z
 		ARG 0 mouseX
 		ARG 1 mouseX
 		ARG 2 keyCode
+		ARG 3 mouseY
+		ARG 5 button
 	METHOD b focusOn (Lcqb;)V
-	METHOD e setEnabled (Z)V
+		ARG 1 listener
+	METHOD e setActive (Z)V
+		ARG 1 active
+	METHOD getFocused ()Lcqb;
 	METHOD t focusNext ()V
+		ARG 1 index
+		ARG 2 nextIndex

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

@@ -1,18 +1,24 @@
 CLASS cqb net/minecraft/client/gui/GuiEventListener
 	METHOD a charTyped (CI)Z
 		ARG 1 chr
+		ARG 2 keyCode
 	METHOD a mouseScrolled (D)Z
+		ARG 1 dY
 	METHOD a mouseClicked (DDI)Z
 		ARG 2 keyCode
 		ARG 3 mouseY
+		ARG 5 button
 	METHOD a mouseDragged (DDIDD)Z
 		ARG 1 mouseX
 		ARG 3 mouseY
+		ARG 5 button
 	METHOD a keyPressed (III)Z
 		ARG 1 keyCode
 		ARG 2 scanCode
 	METHOD b mouseReleased (DDI)Z
 		ARG 2 keyCode
+		ARG 3 mouseY
+		ARG 5 button
 	METHOD b setHasFocus (Z)V
 	METHOD c keyReleased (III)Z
 		ARG 1 keyCode

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

@@ -1,15 +1,18 @@
-CLASS cqc
+CLASS cqc net/minecraft/client/gui/InputListener
 	METHOD a charTyped (CI)Z
 		ARG 1 chr
 	METHOD a mouseScrolled (D)Z
+		ARG 1 dY
 	METHOD a mouseClicked (DDI)Z
 		ARG 0 mouseX
 		ARG 1 mouseX
 		ARG 2 keyCode
 		ARG 3 mouseY
+		ARG 5 button
 	METHOD a mouseDragged (DDIDD)Z
 		ARG 1 mouseX
 		ARG 3 mouseY
+		ARG 5 button
 	METHOD a keyPressed (III)Z
 		ARG 1 keyCode
 		ARG 2 scanCode
@@ -17,6 +20,9 @@ CLASS cqc
 		ARG 0 mouseX
 		ARG 1 mouseX
 		ARG 2 keyCode
+		ARG 3 mouseY
+		ARG 5 button
 	METHOD c keyReleased (III)Z
 		ARG 1 keyCode
 		ARG 2 scanCode
+	METHOD getFocused ()Lcqb;

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

@@ -54,6 +54,7 @@ CLASS csq net/minecraft/client/gui/MainMenuGui
 		ARG 1 mouseX
 		ARG 2 keyCode
 		ARG 3 mouseY
+		ARG 5 button
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY

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

@@ -29,4 +29,5 @@ CLASS cth net/minecraft/client/gui/container/AnvilGui
 	METHOD c drawForeground (II)V
 		ARG 1 mouseX
 		ARG 2 mouseY
+	METHOD getFocused ()Lcqb;
 	METHOD n onClosed ()V

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

@@ -14,6 +14,7 @@ CLASS ctn net/minecraft/client/gui/container/CraftingTableGui
 		ARG 1 mouseX
 		ARG 2 keyCode
 		ARG 3 mouseY
+		ARG 5 button
 	METHOD a isClickInContainerBounds (DDIII)Z
 		ARG 1 mouseX
 		ARG 3 mouseY
@@ -39,5 +40,6 @@ CLASS ctn net/minecraft/client/gui/container/CraftingTableGui
 		ARG 1 mouseX
 		ARG 2 mouseY
 	METHOD f update ()V
+	METHOD getFocused ()Lcqb;
 	METHOD i getRecipeBookGui ()Lcur;
 	METHOD n onClosed ()V

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

@@ -12,6 +12,7 @@ CLASS ctt net/minecraft/client/gui/container/EnchantingGui
 		ARG 1 mouseX
 		ARG 2 keyCode
 		ARG 3 mouseY
+		ARG 5 button
 		ARG 6 centerX
 		ARG 7 centerY
 		ARG 9 x

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

@@ -13,11 +13,13 @@ CLASS ctu net/minecraft/client/gui/container/FurnaceGui
 		ARG 2 inventory
 	METHOD a charTyped (CI)Z
 		ARG 1 chr
+		ARG 2 keyCode
 	METHOD a mouseClicked (DDI)Z
 		ARG 0 mouseX
 		ARG 1 mouseX
 		ARG 2 keyCode
 		ARG 3 mouseY
+		ARG 5 button
 	METHOD a isClickInContainerBounds (DDIII)Z
 		ARG 1 mouseX
 		ARG 3 mouseY

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

@@ -1,14 +1,17 @@
 CLASS cua net/minecraft/client/gui/container/LoomGui
 	FIELD w TEXTURE Lpz;
 	METHOD a mouseScrolled (D)Z
+		ARG 1 dY
 	METHOD a mouseClicked (DDI)Z
 		ARG 0 mouseX
 		ARG 1 mouseX
 		ARG 2 keyCode
 		ARG 3 mouseY
+		ARG 5 button
 	METHOD a mouseDragged (DDIDD)Z
 		ARG 1 mouseX
 		ARG 3 mouseY
+		ARG 5 button
 	METHOD a isClickInContainerBounds (DDIII)Z
 		ARG 1 mouseX
 		ARG 3 mouseY

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

@@ -6,11 +6,13 @@ CLASS cur net/minecraft/client/gui/container/RecipeBookGui
 	FIELD t cachedInvChangeCount I
 	METHOD a charTyped (CI)Z
 		ARG 1 chr
+		ARG 2 keyCode
 	METHOD a mouseClicked (DDI)Z
 		ARG 0 mouseX
 		ARG 1 mouseX
 		ARG 2 keyCode
 		ARG 3 mouseY
+		ARG 5 button
 		ARG 6 recipe
 	METHOD a keyPressed (III)Z
 		ARG 1 keyCode

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

@@ -1,4 +1,42 @@
 CLASS cph net/minecraft/client/gui/hud/DebugHud
 	FIELD a client Lcof;
 	FIELD f fontRenderer Lcou;
+	FIELD g blockHit Lckw;
+	FIELD h fluidHit Lckw;
+	FIELD i pos Lbag;
+	FIELD j chunk Lbql;
+	METHOD <init> (Lcof;)V
+		ARG 1 client
+	METHOD a interpolateColor (IIF)I
+		ARG 1 color1
+		ARG 2 color2
+		ARG 3 dt
+		ARG 4 alpha1
+		ARG 5 red1
+		ARG 6 green1
+		ARG 7 blue1
+		ARG 8 alpha2
+		ARG 9 red2
+		ARG 10 green2
+		ARG 11 blue2
+		ARG 12 alphaResult
+		ARG 13 redResult
+		ARG 14 greenResult
+		ARG 15 blueResult
+	METHOD b ()V
+		ARG 1 camera
+		ARG 2 width
+		ARG 3 server
 	METHOD c drawLeftInfoText ()V
+		ARG 1 lines
+		ARG 3 line
+		ARG 4 height
+		ARG 5 width
+	METHOD e ()Ljava/util/List;
+		ARG 2 server
+		ARG 6 pos
+		ARG 7 camera
+		ARG 8 facing
+		ARG 9 facingText
+		ARG 10 dimType
+		ARG 11 chunkPos

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

@@ -1,11 +1,13 @@
 CLASS cro net/minecraft/client/gui/ingame/ChatGui
 	FIELD a chatField Lcpi;
 	METHOD a mouseScrolled (D)Z
+		ARG 1 dY
 	METHOD a mouseClicked (DDI)Z
 		ARG 0 mouseX
 		ARG 1 mouseX
 		ARG 2 keyCode
 		ARG 3 mouseY
+		ARG 5 button
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY
@@ -18,4 +20,5 @@ CLASS cro net/minecraft/client/gui/ingame/ChatGui
 	METHOD c onInitialized ()V
 	METHOD e isPauseScreen ()Z
 	METHOD f update ()V
+	METHOD getFocused ()Lcqb;
 	METHOD n onClosed ()V

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

@@ -47,15 +47,19 @@ CLASS ctp net/minecraft/client/gui/ingame/CreativeInventoryGui
 	FIELD z selectedTab I
 	METHOD a charTyped (CI)Z
 		ARG 1 chr
+		ARG 2 keyCode
 	METHOD a mouseScrolled (D)Z
+		ARG 1 dY
 	METHOD a mouseClicked (DDI)Z
 		ARG 0 mouseX
 		ARG 1 mouseX
 		ARG 2 keyCode
 		ARG 3 mouseY
+		ARG 5 button
 	METHOD a mouseDragged (DDIDD)Z
 		ARG 1 mouseX
 		ARG 3 mouseY
+		ARG 5 button
 	METHOD a isClickInContainerBounds (DDIII)Z
 		ARG 1 mouseX
 		ARG 3 mouseY
@@ -80,6 +84,8 @@ CLASS ctp net/minecraft/client/gui/ingame/CreativeInventoryGui
 		ARG 0 mouseX
 		ARG 1 mouseX
 		ARG 2 keyCode
+		ARG 3 mouseY
+		ARG 5 button
 	METHOD b setSelectedTab (Laul;)V
 	METHOD b onScaleChanged (Lcof;II)V
 		ARG 1 client

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

@@ -14,6 +14,7 @@ CLASS crv net/minecraft/client/gui/ingame/DeathGui
 		ARG 1 mouseX
 		ARG 2 keyCode
 		ARG 3 mouseY
+		ARG 5 button
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY

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

@@ -42,14 +42,17 @@ CLASS ctj net/minecraft/client/gui/ingame/EditBookGui
 		ARG 2 stack
 	METHOD a charTyped (CI)Z
 		ARG 1 chr
+		ARG 2 keyCode
 	METHOD a mouseClicked (DDI)Z
 		ARG 0 mouseX
 		ARG 1 mouseX
 		ARG 2 keyCode
 		ARG 3 mouseY
+		ARG 5 button
 	METHOD a mouseDragged (DDIDD)Z
 		ARG 1 mouseX
 		ARG 3 mouseY
+		ARG 5 button
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY

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

@@ -6,6 +6,7 @@ CLASS cue net/minecraft/client/gui/ingame/EditSignGui
 	FIELD a sign Lbnm;
 	METHOD a charTyped (CI)Z
 		ARG 1 chr
+		ARG 2 keyCode
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY

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

@@ -10,6 +10,7 @@ CLASS cty net/minecraft/client/gui/ingame/InventoryGui
 		ARG 1 mouseX
 		ARG 2 keyCode
 		ARG 3 mouseY
+		ARG 5 button
 	METHOD a isClickInContainerBounds (DDIII)Z
 		ARG 1 mouseX
 		ARG 3 mouseY
@@ -36,10 +37,13 @@ CLASS cty net/minecraft/client/gui/ingame/InventoryGui
 		ARG 0 mouseX
 		ARG 1 mouseX
 		ARG 2 keyCode
+		ARG 3 mouseY
+		ARG 5 button
 	METHOD c onInitialized ()V
 	METHOD c drawForeground (II)V
 		ARG 1 mouseX
 		ARG 2 mouseY
 	METHOD f update ()V
+	METHOD getFocused ()Lcqb;
 	METHOD i getRecipeBookGui ()Lcur;
 	METHOD n onClosed ()V

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

@@ -12,6 +12,7 @@ CLASS ctz net/minecraft/client/gui/ingame/JigsawBlockGui
 		ARG 1 mouseX
 		ARG 2 keyCode
 		ARG 3 mouseY
+		ARG 5 button
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY

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

@@ -26,6 +26,7 @@ CLASS cuf net/minecraft/client/gui/ingame/StructureBlockGui
 	CLASS cuf$7
 		METHOD a charTyped (CI)Z
 			ARG 1 chr
+			ARG 2 keyCode
 	CLASS cuf$9
 		METHOD a onPressed (DD)V
 			ARG 0 mouseX
@@ -91,6 +92,7 @@ CLASS cuf net/minecraft/client/gui/ingame/StructureBlockGui
 		ARG 1 mouseX
 		ARG 2 keyCode
 		ARG 3 mouseY
+		ARG 5 button
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY

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

@@ -24,4 +24,5 @@ CLASS crz net/minecraft/client/gui/menu/AddServerGui
 	METHOD c onInitialized ()V
 	METHOD f update ()V
 	METHOD g close ()V
+	METHOD getFocused ()Lcqb;
 	METHOD n onClosed ()V

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

@@ -9,9 +9,11 @@ CLASS cta net/minecraft/client/gui/menu/AdvancementsGui
 		ARG 1 mouseX
 		ARG 2 keyCode
 		ARG 3 mouseY
+		ARG 5 button
 	METHOD a mouseDragged (DDIDD)Z
 		ARG 1 mouseX
 		ARG 3 mouseY
+		ARG 5 button
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY

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

@@ -34,6 +34,7 @@ CLASS cvk net/minecraft/client/gui/menu/BackupLevelGui
 		ARG 1 callback
 	METHOD a charTyped (CI)Z
 		ARG 1 chr
+		ARG 2 keyCode
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY

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

@@ -55,3 +55,4 @@ CLASS cru net/minecraft/client/gui/menu/CustomizeNewFlatLevelGui
 		ARG 1 mouseX
 		ARG 2 mouseY
 	METHOD c onInitialized ()V
+	METHOD getFocused ()Lcqb;

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

@@ -9,6 +9,7 @@ CLASS crx net/minecraft/client/gui/menu/DirectConnectServerGui
 			ARG 1 mouseY
 	METHOD a charTyped (CI)Z
 		ARG 1 chr
+		ARG 2 keyCode
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY

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

@@ -27,7 +27,9 @@ CLASS cvm net/minecraft/client/gui/menu/LevelSelectGui
 	FIELD h LOGGER Lorg/apache/logging/log4j/Logger;
 	METHOD a charTyped (CI)Z
 		ARG 1 chr
+		ARG 2 keyCode
 	METHOD a mouseScrolled (D)Z
+		ARG 1 dY
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY

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

@@ -10,5 +10,6 @@ CLASS cuk net/minecraft/client/gui/menu/ListEntryLocalServer
 		ARG 1 mouseX
 		ARG 2 keyCode
 		ARG 3 mouseY
+		ARG 5 button
 	METHOD a drawEntry (IIIIZF)V
 	METHOD e getLanServerEntry ()Ldor;

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

@@ -11,5 +11,6 @@ CLASS cul net/minecraft/client/gui/menu/ListEntryRemoteServer
 		ARG 1 mouseX
 		ARG 2 keyCode
 		ARG 3 mouseY
+		ARG 5 button
 	METHOD a drawEntry (IIIIZF)V
 	METHOD a drawIcon (IILpz;)V

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

@@ -40,4 +40,5 @@ CLASS cui net/minecraft/client/gui/menu/MultiplayerGui
 	METHOD confirmResult handle (ZI)V
 		ARG 1 result
 	METHOD f update ()V
+	METHOD getFocused ()Lcqb;
 	METHOD n onClosed ()V

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

@@ -52,11 +52,13 @@ CLASS cvj net/minecraft/client/gui/menu/NewLevelGui
 	FIELD v commandsAllowed Z
 	METHOD a charTyped (CI)Z
 		ARG 1 chr
+		ARG 2 keyCode
 	METHOD a mouseClicked (DDI)Z
 		ARG 0 mouseX
 		ARG 1 mouseX
 		ARG 2 keyCode
 		ARG 3 mouseY
+		ARG 5 button
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY

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

@@ -16,6 +16,7 @@ CLASS csi net/minecraft/client/gui/menu/NewLevelPresetsGui
 			ARG 2 y
 		METHOD d getEntryCount ()I
 	METHOD a mouseScrolled (D)Z
+		ARG 1 dY
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY

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

@@ -4,14 +4,17 @@ CLASS crh net/minecraft/client/gui/menu/RealmsGui
 	METHOD a getRealmsScreen ()Lnet/minecraft/realms/RealmsScreen;
 	METHOD a charTyped (CI)Z
 		ARG 1 chr
+		ARG 2 keyCode
 	METHOD a mouseClicked (DDI)Z
 		ARG 0 mouseX
 		ARG 1 mouseX
 		ARG 2 keyCode
 		ARG 3 mouseY
+		ARG 5 button
 	METHOD a mouseDragged (DDIDD)Z
 		ARG 1 mouseX
 		ARG 3 mouseY
+		ARG 5 button
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY
@@ -52,6 +55,8 @@ CLASS crh net/minecraft/client/gui/menu/RealmsGui
 		ARG 0 mouseX
 		ARG 1 mouseX
 		ARG 2 keyCode
+		ARG 3 mouseY
+		ARG 5 button
 	METHOD b drawTexturedRect (IIIIII)V
 		ARG 1 x
 		ARG 2 y

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

@@ -50,3 +50,4 @@ CLASS cst net/minecraft/client/gui/menu/StatsGui
 		ARG 2 mouseY
 	METHOD c onInitialized ()V
 	METHOD e isPauseScreen ()Z
+	METHOD getFocused ()Lcqb;

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

@@ -23,6 +23,7 @@ CLASS ctd net/minecraft/client/gui/menu/settings/ControlsSettingsGui
 		ARG 1 mouseX
 		ARG 2 keyCode
 		ARG 3 mouseY
+		ARG 5 button
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY
@@ -33,4 +34,6 @@ CLASS ctd net/minecraft/client/gui/menu/settings/ControlsSettingsGui
 		ARG 0 mouseX
 		ARG 1 mouseX
 		ARG 2 keyCode
+		ARG 3 mouseY
+		ARG 5 button
 	METHOD c onInitialized ()V

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

@@ -25,3 +25,4 @@ CLASS csd net/minecraft/client/gui/menu/settings/LanguageSettingsGui
 		ARG 1 mouseX
 		ARG 2 mouseY
 	METHOD c onInitialized ()V
+	METHOD getFocused ()Lcqb;

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

@@ -24,3 +24,4 @@ CLASS cso net/minecraft/client/gui/menu/settings/SnooperSettingsGui
 		ARG 1 mouseX
 		ARG 2 mouseY
 	METHOD c onInitialized ()V
+	METHOD getFocused ()Lcqb;

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

@@ -14,6 +14,7 @@ CLASS csr net/minecraft/client/gui/menu/settings/VideoSettingsGui
 		ARG 1 mouseX
 		ARG 2 keyCode
 		ARG 3 mouseY
+		ARG 5 button
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY
@@ -21,5 +22,8 @@ CLASS csr net/minecraft/client/gui/menu/settings/VideoSettingsGui
 		ARG 0 mouseX
 		ARG 1 mouseX
 		ARG 2 keyCode
+		ARG 3 mouseY
+		ARG 5 button
 	METHOD c onInitialized ()V
 	METHOD g close ()V
+	METHOD getFocused ()Lcqb;

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

@@ -11,15 +11,19 @@ CLASS cpv net/minecraft/client/gui/widget/AbstractListWidget
 		ARG 1 client
 	METHOD a charTyped (CI)Z
 		ARG 1 chr
+		ARG 2 keyCode
 	METHOD a mouseScrolled (D)Z
+		ARG 1 dY
 	METHOD a mouseClicked (DDI)Z
 		ARG 0 mouseX
 		ARG 1 mouseX
 		ARG 2 keyCode
 		ARG 3 mouseY
+		ARG 5 button
 	METHOD a mouseDragged (DDIDD)Z
 		ARG 1 mouseX
 		ARG 3 mouseY
+		ARG 5 button
 	METHOD a isSelected (I)Z
 		ARG 0 index
 	METHOD a draw (IIF)V
@@ -35,6 +39,8 @@ CLASS cpv net/minecraft/client/gui/widget/AbstractListWidget
 		ARG 0 mouseX
 		ARG 1 mouseX
 		ARG 2 keyCode
+		ARG 3 mouseY
+		ARG 5 button
 	METHOD c (IIII)V
 		ARG 1 width
 		ARG 2 height

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

@@ -27,9 +27,11 @@ CLASS cpe net/minecraft/client/gui/widget/ButtonWidget
 		ARG 1 mouseX
 		ARG 2 keyCode
 		ARG 3 mouseY
+		ARG 5 button
 	METHOD a mouseDragged (DDIDD)Z
 		ARG 1 mouseX
 		ARG 3 mouseY
+		ARG 5 button
 	METHOD a setWidth (I)V
 	METHOD a onHover (II)V
 		ARG 0 mouseX
@@ -54,3 +56,5 @@ CLASS cpe net/minecraft/client/gui/widget/ButtonWidget
 		ARG 0 mouseX
 		ARG 1 mouseX
 		ARG 2 keyCode
+		ARG 3 mouseY
+		ARG 5 button

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

@@ -16,11 +16,14 @@ CLASS ctc net/minecraft/client/gui/widget/KeyBindingListWidget
 			ARG 1 mouseX
 			ARG 2 keyCode
 			ARG 3 mouseY
+			ARG 5 button
 		METHOD a drawEntry (IIIIZF)V
 		METHOD b mouseReleased (DDI)Z
 			ARG 0 mouseX
 			ARG 1 mouseX
 			ARG 2 keyCode
+			ARG 3 mouseY
+			ARG 5 button
 	FIELD v gui Lctd;
 	FIELD w client Lcof;
 	METHOD <init> (Lctd;Lcof;)V

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

@@ -11,4 +11,5 @@ CLASS cvn net/minecraft/client/gui/widget/LevelEntryWidget
 		ARG 1 mouseX
 		ARG 2 keyCode
 		ARG 3 mouseY
+		ARG 5 button
 	METHOD a drawEntry (IIIIZF)V

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

@@ -13,11 +13,13 @@ CLASS cpi net/minecraft/client/gui/widget/TextFieldWidget
 	METHOD a tick ()V
 	METHOD a charTyped (CI)Z
 		ARG 1 chr
+		ARG 2 keyCode
 	METHOD a mouseClicked (DDI)Z
 		ARG 0 mouseX
 		ARG 1 mouseX
 		ARG 2 keyCode
 		ARG 3 mouseY
+		ARG 5 button
 	METHOD a render (IIF)V
 	METHOD a keyPressed (III)Z
 		ARG 1 keyCode

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

@@ -9,11 +9,14 @@ CLASS cps net/minecraft/client/gui/widget/VideoSettingsListWidget
 			ARG 1 mouseX
 			ARG 2 keyCode
 			ARG 3 mouseY
+			ARG 5 button
 		METHOD a drawEntry (IIIIZF)V
 		METHOD b mouseReleased (DDI)Z
 			ARG 0 mouseX
 			ARG 1 mouseX
 			ARG 2 keyCode
+			ARG 3 mouseY
+			ARG 5 button
 	METHOD <init> (Lcof;IIIII[Lcoh$a;)V
 		ARG 1 client
 	METHOD e getEntryWidth ()I

mappings/net/minecraft/client/main/Main.mapping

@@ -1,2 +1,68 @@
-CLASS net/minecraft/client/main/Main
+CLASS net/minecraft/client/main/Main net/minecraft/client/main/Main
+	CLASS net/minecraft/client/main/Main$1
+		METHOD getPasswordAuthentication ()Ljava/net/PasswordAuthentication;
+	CLASS net/minecraft/client/main/Main$2
+		METHOD run ()V
+			ARG 1 client
+			ARG 2 server
 	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
+	METHOD a isNotNullOrEmpty (Ljava/lang/String;)Z
+		ARG 0 s
+	METHOD a getOption (Ljoptsimple/OptionSet;Ljoptsimple/OptionSpec;)Ljava/lang/Object;
+		ARG 0 optionSet
+		ARG 1 optionSpec
+		ARG 3 argSpec
+		ARG 4 defaultValues
+	METHOD main ([Ljava/lang/String;)V
+		ARG 0 args
+		ARG 1 parser
+		ARG 2 optServer
+		ARG 3 optPort
+		ARG 4 optGameDir
+		ARG 5 optAssetsDir
+		ARG 6 optResPackDir
+		ARG 7 optProxyHost
+		ARG 8 optProxyPort
+		ARG 9 optProxyUser
+		ARG 10 optProxyPass
+		ARG 11 optUsername
+		ARG 12 optUUID
+		ARG 13 optAccessToken
+		ARG 14 optVersion
+		ARG 15 optWidth
+		ARG 16 optHeight
+		ARG 17 optFullscreenWidth
+		ARG 18 optFullscreenHeight
+		ARG 19 optUserProps
+		ARG 20 optProfileProps
+		ARG 21 optAssetIndex
+		ARG 22 optUserType
+		ARG 23 optVersionType
+		ARG 24 optCatchAll
+		ARG 25 opts
+		ARG 26 ignored
+		ARG 27 proxyHost
+		ARG 28 proxy
+		ARG 29 proxyUser
+		ARG 30 proxyPass
+		ARG 31 windowWidth
+		ARG 32 windowHeight
+		ARG 33 fsWidth
+		ARG 34 fsHeight
+		ARG 35 fullscreen
+		ARG 36 demo
+		ARG 37 version
+		ARG 38 gson
+		ARG 39 userProps
+		ARG 40 profileProps
+		ARG 41 versionType
+		ARG 42 gameDir
+		ARG 43 assetsDir
+		ARG 44 resPackDir
+		ARG 45 uuid
+		ARG 46 assetIndex
+		ARG 47 server
+		ARG 48 serverPort
+		ARG 49 session
+		ARG 50 runArgs
+		ARG 51 shutdownThread

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

@@ -1 +1,4 @@
 CLASS cnm net/minecraft/client/render/Vec3d
+	FIELD a x D
+	FIELD b y D
+	FIELD c z D

mappings/net/minecraft/client/resource/DirectResourceIndex.mapping

@@ -0,0 +1,14 @@
+CLASS dmh net/minecraft/client/resource/DirectResourceIndex
+	FIELD b assetDir Ljava/io/File;
+	METHOD <init> (Ljava/io/File;)V
+		ARG 1 assetDir
+	METHOD a findFile (Ljava/lang/String;)Ljava/io/File;
+		ARG 1 path
+	METHOD a getFilesRecursively (Ljava/lang/String;ILjava/util/function/Predicate;)Ljava/util/Collection;
+		ARG 0 p
+		ARG 1 dir
+		ARG 2 unused
+		ARG 3 filter
+		ARG 4 path
+	METHOD a getResource (Lpz;)Ljava/io/File;
+		ARG 1 identifier

mappings/net/minecraft/client/resource/ResourceIndex.mapping

@@ -3,5 +3,22 @@ CLASS dmd net/minecraft/client/resource/ResourceIndex
 	FIELD b index Ljava/util/Map;
 	METHOD <init> (Ljava/io/File;Ljava/lang/String;)V
 		ARG 1 directory
+		ARG 2 indexName
+		ARG 3 objectsDir
+		ARG 4 indexFile
+		ARG 5 reader
+		ARG 6 indexData
+		ARG 7 objects
+		ARG 10 entryData
+		ARG 11 entryName
+		ARG 13 path
+		ARG 14 hash
+		ARG 15 mappedPath
 	METHOD a findFile (Ljava/lang/String;)Ljava/io/File;
+		ARG 1 path
+	METHOD a getFilesRecursively (Ljava/lang/String;ILjava/util/function/Predicate;)Ljava/util/Collection;
+		ARG 1 dir
+		ARG 2 unused
+		ARG 3 filter
 	METHOD a getResource (Lpz;)Ljava/io/File;
+		ARG 1 identifier

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

@@ -1,10 +1,13 @@
 CLASS cog net/minecraft/client/util/Mouse
 	FIELD a client Lcof;
+	METHOD <init> (Lcof;)V
+		ARG 1 client
 	METHOD a setup (J)V
 	METHOD a onMouseScroll (JDD)V
 		ARG 1 window
 	METHOD a onMouseButton (JIII)V
 		ARG 1 window
 		ARG 3 button
+		ARG 7 finalButton
 	METHOD b onCursorPos (JDD)V
 		ARG 1 window

mappings/net/minecraft/client/world/ClientWorld.mapping

@@ -39,6 +39,7 @@ CLASS czu net/minecraft/client/world/ClientWorld
 		ARG 3 category
 		ARG 4 volume
 		ARG 5 pitch
+	METHOD a tick (Ljava/util/function/BooleanSupplier;)V
 	METHOD a sendPacket (Ljp;)V
 	METHOD b getEntityById (I)Lagk;
 	METHOD b setTimeOfDay (J)V

mappings/net/minecraft/server/MinecraftServer.mapping

@@ -23,7 +23,7 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer
 	FIELD V sessionService Lcom/mojang/authlib/minecraft/MinecraftSessionService;
 	FIELD W gameProfileRepo Lcom/mojang/authlib/GameProfileRepository;
 	FIELD X userCache Lwj;
-	FIELD Z serverStartTime J
+	FIELD Z timeReference J
 	FIELD a USER_CACHE_FILE Ljava/io/File;
 	FIELD aa iconFilePresent Z
 	FIELD ab dataManager Lwb;
@@ -91,11 +91,16 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer
 	METHOD a setResourcePack (Ljava/lang/String;Ljava/lang/String;)V
 		ARG 1 url
 	METHOD a setKeyPair (Ljava/security/KeyPair;)V
+	METHOD a (Ljava/util/function/BooleanSupplier;)V
+		ARG 2 startTime
+		ARG 6 endTime
 	METHOD a appendCommandFeedback (Ljb;)V
 	METHOD a registerTickable (Lqq;)V
 	METHOD a getSpawnRadius (Luk;)I
 	METHOD a setConfigurationManager (Lwn;)V
 	METHOD a stop (Z)V
+	METHOD a save (ZZ)V
+		ARG 1 silent
 	METHOD aA getServerStartTime ()J
 	METHOD aB getMainThread ()Ljava/lang/Thread;
 	METHOD aC getDataFixer ()Lcom/mojang/datafixers/DataFixer;
@@ -109,6 +114,7 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer
 	METHOD aP getLootManager ()Lchw;
 	METHOD aQ getGameRules ()Lbao;
 	METHOD aV getProfiler ()Laeh;
+	METHOD aX shouldKeepTicking ()Z
 	METHOD aa areCommandBlocksEnabled ()Z
 	METHOD ab getServerMotd ()Ljava/lang/String;
 	METHOD ac getWorldHeight ()I
@@ -134,6 +140,7 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer
 	METHOD b setWorldHeight (I)V
 	METHOD b appendCrashReportDetails (Lb;)Lb;
 	METHOD b setServerIp (Ljava/lang/String;)V
+	METHOD b tick (Ljava/util/function/BooleanSupplier;)V
 	METHOD b setForceWorldUpgrade (Z)V
 	METHOD c setPlayerIdleTimeout (I)V
 	METHOD c getFile (Ljava/lang/String;)Ljava/io/File;
@@ -169,6 +176,9 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer
 	METHOD o isRunning ()Z
 	METHOD q executeQueuedTask ()Z
 	METHOD r hasIconFile ()Z
+	METHOD run ()V
+		ARG 1 dt
+		ARG 3 ticksSkipped
 	METHOD s getIconFile ()Ljava/io/File;
 	METHOD t getRunDirectory ()Ljava/io/File;
 	METHOD u exit ()V

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

@@ -18,6 +18,7 @@ CLASS to net/minecraft/server/dedicated/MinecraftDedicatedServer
 	METHOD aw getMaxWorldBorderRadius ()I
 	METHOD az getNetworkCompressionThreshold ()I
 	METHOD b appendCrashReportDetails (Lb;)Lb;
+	METHOD b tick (Ljava/util/function/BooleanSupplier;)V
 	METHOD ba createGui ()V
 	METHOD bc getMaxTickTime ()J
 	METHOD c setPlayerIdleTimeout (I)V

mappings/net/minecraft/server/world/ServerChunkProvider.mapping

@@ -1,10 +1,14 @@
 CLASS uj net/minecraft/server/world/ServerChunkProvider
 	FIELD b LOGGER Lorg/apache/logging/log4j/Logger;
+	FIELD g chunkSaveHandler Lbqy;
 	FIELD h world Lbas;
 	FIELD l loadedChunkMap Lit/unimi/dsi/fastutil/longs/Long2ObjectLinkedOpenHashMap;
 	FIELD r genWorkerPool Ljava/util/concurrent/ExecutorService;
 	FIELD s genWorkerId Ljava/util/concurrent/atomic/AtomicInteger;
 	METHOD a getLightingProvider ()Lcdq;
+	METHOD a save (Z)V
+		ARG 1 saveChunks
+		ARG 4 chunk
 	METHOD b get (II)Lbae;
 		ARG 1 chunkX
 	METHOD d isGenerationDisabled (Lum;)Z

mappings/net/minecraft/server/world/ServerWorld.mapping

@@ -27,7 +27,9 @@ CLASS uk net/minecraft/server/world/ServerWorld
 		ARG 2 block
 		ARG 3 first
 	METHOD a getEntityByUuid (Ljava/util/UUID;)Lagk;
+	METHOD a tick (Ljava/util/function/BooleanSupplier;)V
 	METHOD a loadEntities (Ljava/util/stream/Stream;)V
+	METHOD a save (Lyr;Z)V
 	METHOD ak shouldSpawnNpcs ()Z
 	METHOD al shouldSpawnAnimals ()Z
 	METHOD am setDebugWorldProperties ()V

mappings/net/minecraft/util/MetricsData.mapping

@@ -0,0 +1,8 @@
+CLASS yi net/minecraft/util/MetricsData
+	FIELD a samples [J
+	FIELD c sampleCount I
+	FIELD d writeIndex I
+	METHOD a pushSample (J)V
+		ARG 1 time
+	METHOD b getCurrentIndex ()I
+	METHOD c getSamples ()[J

mappings/net/minecraft/world/BlockView.mapping

@@ -2,7 +2,12 @@ CLASS bae net/minecraft/world/BlockView
 	METHOD H getMaxLightLevel ()I
 	METHOD I getHeight ()I
 	METHOD b getBlockState (Let;)Lbom;
+		ARG 1 pos
 	METHOD c getFluidState (Let;)Lcdz;
 		ARG 0 pos
+		ARG 1 pos
 	METHOD f getBlockEntity (Let;)Lbmq;
 		ARG 0 pos
+		ARG 1 pos
+	METHOD j getLuminance (Let;)I
+		ARG 1 pos

mappings/net/minecraft/world/ChunkSaveHandler.mapping

@@ -0,0 +1,2 @@
+CLASS bqy net/minecraft/world/ChunkSaveHandler
+	METHOD b save ()V

mappings/net/minecraft/world/ChunkSaveHandlerImpl.mapping

@@ -0,0 +1,2 @@
+CLASS bqx net/minecraft/world/ChunkSaveHandlerImpl
+	METHOD b save ()V

mappings/net/minecraft/world/World.mapping

@@ -177,6 +177,7 @@ CLASS bas net/minecraft/world/World
 	METHOD a getPlayerByName (Ljava/lang/String;)Laql;
 	METHOD a addBlockEntities (Ljava/util/Collection;)V
 	METHOD a getEntityByUuid (Ljava/util/UUID;)Lagk;
+	METHOD a tick (Ljava/util/function/BooleanSupplier;)V
 	METHOD a loadEntities (Ljava/util/stream/Stream;)V
 	METHOD a sendPacket (Ljp;)V
 	METHOD aa getTicksSinceLightningClient ()I
@@ -197,6 +198,7 @@ CLASS bas net/minecraft/world/World
 	METHOD b unloadBlockEntity (Lbmq;)V
 	METHOD b doesAreaContainFireSource (Lckv;)Z
 	METHOD b getBlockState (Let;)Lbom;
+		ARG 1 pos
 	METHOD b updateNeighborsAlways (Let;Lbft;)V
 		ARG 1 pos
 	METHOD b markDirty (Let;Lbmq;)V

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

@@ -1,61 +1,15 @@
-CLASS bql net/minecraft/world/chunk/Chunk
+CLASS bpz net/minecraft/world/chunk/Chunk
-	CLASS bql$a AccessType
-		FIELD a CREATE Lbql$a;
-		FIELD c GET Lbql$a;
-	FIELD a EMPTY_SECTION Lbqm;
-	FIELD b LOGGER Lorg/apache/logging/log4j/Logger;
-	FIELD c sections [Lbqm;
-	FIELD d biomeArray [Lbbr;
-	FIELD e pendingBlockEntityTags Ljava/util/Map;
-	FIELD f loadedToWorld Z
-	FIELD g world Lbas;
-	FIELD j blockEntityMap Ljava/util/Map;
-	FIELD k entitySections [Lyd;
-	FIELD s dirty Z
-	FIELD w pos Lbag;
-	METHOD <init> (Lbas;II[Lbbr;Lbqv;Lbbj;Lbbj;J[Lbqm;Ljava/util/function/Consumer;)V
-		ARG 4 biomeArray
-	METHOD A getBlockEntityMap ()Ljava/util/Map;
-	METHOD B getEntitySectionArray ()[Lyd;
-	METHOD a getFluidState (III)Lcdz;
-		ARG 1 x
-		ARG 2 y
 	METHOD a addEntity (Lagk;)V
-	METHOD a remove (Lagk;I)V
 		ARG 1 entity
-	METHOD a appendEntities (Lagk;Lckv;Ljava/util/List;Ljava/util/function/Predicate;)V
-		ARG 1 except
-		ARG 2 box
-		ARG 3 entityList
-	METHOD a addBlockEntity (Lbmq;)V
 	METHOD a setBlockEntity (Let;Lbmq;)V
 		ARG 1 pos
+		ARG 2 blockEntity
 	METHOD a setBlockState (Let;Lbom;Z)Lbom;
 		ARG 1 pos
 		ARG 2 state
-	METHOD a getBlockEntity (Let;Lbql$a;)Lbmq;
-		ARG 1 pos
-	METHOD a loadBlockEntity (Let;Lhq;)Lbmq;
-		ARG 1 pos
 	METHOD a addPendingBlockEntityTag (Lhq;)V
-	METHOD a appendEntities (Ljava/lang/Class;Lckv;Ljava/util/List;Ljava/util/function/Predicate;)V
-		ARG 1 entityClass
-		ARG 2 box
-		ARG 3 entityList
-	METHOD b remove (Lagk;)V
-	METHOD b getBlockState (Let;)Lbom;
-	METHOD c getFluidState (Let;)Lcdz;
-		ARG 0 pos
-	METHOD c setLoadedToWorld (Z)V
 	METHOD d getSectionArray ()[Lbqm;
 	METHOD d removeBlockEntity (Let;)V
-	METHOD f getBlockEntity (Let;)Lbmq;
+	METHOD e markBlockForPostProcessing (Let;)V
-		ARG 0 pos
 	METHOD g getPos ()Lbag;
-	METHOD h createBlockEntity (Let;)Lbmq;
 	METHOD i getBiomeArray ()[Lbbr;
-	METHOD s loadToWorld ()V
-	METHOD t unloadFromWorld ()V
-	METHOD u markDirty ()V
-	METHOD y isLoadedToWorld ()Z
-	METHOD z getWorld ()Lbas;

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

@@ -12,6 +12,7 @@ CLASS bbg net/minecraft/world/chunk/ChunkCache
 	METHOD a getBlockEntity (Let;Lbql$a;)Lbmq;
 		ARG 1 pos
 	METHOD b getBlockState (Let;)Lbom;
+		ARG 1 pos
 	METHOD c getFluidState (Let;)Lcdz;
 		ARG 0 pos
 	METHOD e getBiome (Let;)Lbbr;

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

@@ -4,6 +4,7 @@ CLASS bqg net/minecraft/world/chunk/EmptyChunk
 		ARG 1 world
 		ARG 2 x
 	METHOD a addEntity (Lagk;)V
+		ARG 1 entity
 	METHOD a remove (Lagk;I)V
 		ARG 1 entity
 	METHOD a appendEntities (Lagk;Lckv;Ljava/util/List;Ljava/util/function/Predicate;)V
@@ -13,6 +14,7 @@ CLASS bqg net/minecraft/world/chunk/EmptyChunk
 	METHOD a addBlockEntity (Lbmq;)V
 	METHOD a setBlockEntity (Let;Lbmq;)V
 		ARG 1 pos
+		ARG 2 blockEntity
 	METHOD a getBlockEntity (Let;Lbql$a;)Lbmq;
 		ARG 1 pos
 	METHOD a appendEntities (Ljava/lang/Class;Lckv;Ljava/util/List;Ljava/util/function/Predicate;)V
@@ -21,7 +23,10 @@ CLASS bqg net/minecraft/world/chunk/EmptyChunk
 		ARG 3 entityList
 	METHOD b remove (Lagk;)V
 	METHOD b getBlockState (Let;)Lbom;
+		ARG 1 pos
 	METHOD d removeBlockEntity (Let;)V
+	METHOD j getLuminance (Let;)I
+		ARG 1 pos
 	METHOD s loadToWorld ()V
 	METHOD t unloadFromWorld ()V
 	METHOD u markDirty ()V

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

@@ -1,13 +1,19 @@
-CLASS bqk
+CLASS bqk net/minecraft/world/chunk/ReadOnlyChunk
+	FIELD a wrapped Lbql;
+	METHOD <init> (Lbql;)V
+		ARG 1 wrapped
 	METHOD H getMaxLightLevel ()I
 	METHOD a addEntity (Lagk;)V
+		ARG 1 entity
 	METHOD a setBlockEntity (Let;Lbmq;)V
 		ARG 1 pos
+		ARG 2 blockEntity
 	METHOD a setBlockState (Let;Lbom;Z)Lbom;
 		ARG 1 pos
 		ARG 2 state
 	METHOD a addPendingBlockEntityTag (Lhq;)V
 	METHOD b getBlockState (Let;)Lbom;
+		ARG 1 pos
 	METHOD c getFluidState (Let;)Lcdz;
 		ARG 0 pos
 	METHOD d getSectionArray ()[Lbqm;

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

@@ -0,0 +1,66 @@
+CLASS bql net/minecraft/world/chunk/WorldChunk
+	CLASS bql$a AccessType
+		FIELD a CREATE Lbql$a;
+		FIELD c GET Lbql$a;
+	FIELD a EMPTY_SECTION Lbqm;
+	FIELD b LOGGER Lorg/apache/logging/log4j/Logger;
+	FIELD c sections [Lbqm;
+	FIELD d biomeArray [Lbbr;
+	FIELD e pendingBlockEntityTags Ljava/util/Map;
+	FIELD f loadedToWorld Z
+	FIELD g world Lbas;
+	FIELD j blockEntityMap Ljava/util/Map;
+	FIELD k entitySections [Lyd;
+	FIELD s dirty Z
+	FIELD w pos Lbag;
+	METHOD <init> (Lbas;II[Lbbr;Lbqv;Lbbj;Lbbj;J[Lbqm;Ljava/util/function/Consumer;)V
+		ARG 4 biomeArray
+	METHOD A getBlockEntityMap ()Ljava/util/Map;
+	METHOD B getEntitySectionArray ()[Lyd;
+	METHOD a getFluidState (III)Lcdz;
+		ARG 1 x
+		ARG 2 y
+	METHOD a addEntity (Lagk;)V
+		ARG 1 entity
+	METHOD a remove (Lagk;I)V
+		ARG 1 entity
+	METHOD a appendEntities (Lagk;Lckv;Ljava/util/List;Ljava/util/function/Predicate;)V
+		ARG 1 except
+		ARG 2 box
+		ARG 3 entityList
+	METHOD a addBlockEntity (Lbmq;)V
+	METHOD a setBlockEntity (Let;Lbmq;)V
+		ARG 1 pos
+		ARG 2 blockEntity
+	METHOD a setBlockState (Let;Lbom;Z)Lbom;
+		ARG 1 pos
+		ARG 2 state
+	METHOD a getBlockEntity (Let;Lbql$a;)Lbmq;
+		ARG 1 pos
+	METHOD a loadBlockEntity (Let;Lhq;)Lbmq;
+		ARG 1 pos
+	METHOD a addPendingBlockEntityTag (Lhq;)V
+	METHOD a appendEntities (Ljava/lang/Class;Lckv;Ljava/util/List;Ljava/util/function/Predicate;)V
+		ARG 1 entityClass
+		ARG 2 box
+		ARG 3 entityList
+	METHOD b remove (Lagk;)V
+	METHOD b getBlockState (Let;)Lbom;
+		ARG 1 pos
+	METHOD c getFluidState (Let;)Lcdz;
+		ARG 0 pos
+	METHOD c setLoadedToWorld (Z)V
+	METHOD d getSectionArray ()[Lbqm;
+	METHOD d removeBlockEntity (Let;)V
+	METHOD f getBlockEntity (Let;)Lbmq;
+		ARG 0 pos
+	METHOD g getPos ()Lbag;
+	METHOD h createBlockEntity (Let;)Lbmq;
+	METHOD i getBiomeArray ()[Lbbr;
+	METHOD j getLuminance (Let;)I
+		ARG 1 pos
+	METHOD s loadToWorld ()V
+	METHOD t unloadFromWorld ()V
+	METHOD u markDirty ()V
+	METHOD y isLoadedToWorld ()Z
+	METHOD z getWorld ()Lbas;

mappings/tz.mapping

@@ -0,0 +1,2 @@
+CLASS tz
+	METHOD c getChunk ()Lbql;

mappings/us.mapping

@@ -39,6 +39,7 @@ CLASS us
 	METHOD a getEntities (Ljava/lang/Class;Lckv;Ljava/util/function/Predicate;)Ljava/util/List;
 		ARG 1 entityClass
 	METHOD b getBlockState (Let;)Lbom;
+		ARG 1 pos
 	METHOD c getAmbientDarkness ()I
 	METHOD c getFluidState (Let;)Lcdz;
 		ARG 0 pos