Merge branch 'pull/487' into 19w07a

mappings/crh.mapping

@@ -0,0 +1,2 @@
+CLASS crh
+	FIELD a client Lcqn;

mappings/net/minecraft/client/MinecraftClient.mapping

@@ -44,6 +44,7 @@ CLASS cqn net/minecraft/client/MinecraftClient
 	FIELD a IS_SYSTEM_MAC Z
 	FIELD aa pausedTickDelta F
 	FIELD ab server Ldsk;
+	FIELD ac worldGenProgressTracker Ljava/util/concurrent/atomic/AtomicReference;
 	FIELD ad creativeHotbarStorage Lcqk;
 	FIELD ae assetDirectory Ljava/io/File;
 	FIELD af gameVersion Ljava/lang/String;
@@ -105,6 +106,7 @@ CLASS cqn net/minecraft/client/MinecraftClient
 	METHOD L getLanguageManager ()Ldqi;
 	METHOD M getSpriteAtlas ()Ldpl;
 	METHOD N is64Bit ()Z
+	METHOD O isPaused ()Z
 	METHOD P getSoundLoader ()Ldst;
 	METHOD R getMusicType ()Ldsq$a;
 	METHOD S getSessionService ()Lcom/mojang/authlib/minecraft/MinecraftSessionService;
@@ -168,6 +170,7 @@ CLASS cqn net/minecraft/client/MinecraftClient
 	METHOD b start ()V
 	METHOD b populateCrashReport (Lb;)Lb;
 		ARG 1 report
+	METHOD b setWorld (Ldct;)V
 	METHOD c getFramebuffer ()Lcov;
 	METHOD c printCrashReport (Lb;)V
 	METHOD c setConnectedToRealms (Z)V
@@ -184,8 +187,10 @@ CLASS cqn net/minecraft/client/MinecraftClient
 	METHOD k scheduleStop ()V
 	METHOD m getMusicTracker ()Ldsq;
 	METHOD n tick ()V
+	METHOD o openWorkingScreen ()V
 	METHOD q isDemo ()Z
 	METHOD r getNetworkHandler ()Ldcq;
+	METHOD s isHudEnabled ()Z
 	METHOD t isFancyGraphicsEnabled ()Z
 	METHOD u isAmbientOcclusionEnabled ()Z
 	METHOD v getInstance ()Lcqn;

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

@@ -1,12 +1,5 @@
 CLASS dsq net/minecraft/client/audio/MusicTracker
 	CLASS dsq$a MusicType
-		FIELD a MENU Ldsq$a;
-		FIELD b GAME Ldsq$a;
-		FIELD c CREATIVE Ldsq$a;
-		FIELD d CREDITS Ldsq$a;
-		FIELD e NETHER Ldsq$a;
-		FIELD f DRAGON Ldsq$a;
-		FIELD g END Ldsq$a;
 		FIELD i sound Lxx;
 		FIELD j minDelay I
 		FIELD k maxDelay I
@@ -17,4 +10,6 @@ CLASS dsq net/minecraft/client/audio/MusicTracker
 	FIELD b client Lcqn;
 	FIELD c current Ldrx;
 	FIELD d timeUntilNextSong I
+	METHOD a stop ()V
 	METHOD a play (Ldsq$a;)V
+	METHOD b isPlayingType (Ldsq$a;)Z

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

@@ -1,4 +1,7 @@
 CLASS crc net/minecraft/client/gui/hud/InGameHud
+	FIELD A titleFadeInTicks I
+	FIELD B titleRemainTicks I
+	FIELD C titleFadeOutTicks I
 	FIELD H scaledWidth I
 	FIELD I scaledHeight I
 	FIELD J listeners Ljava/util/Map;
@@ -13,18 +16,35 @@ CLASS crc net/minecraft/client/gui/hud/InGameHud
 	FIELD n overlayMessage Ljava/lang/String;
 	FIELD o overlayRemaining I
 	FIELD p overlayTinted Z
+	FIELD q heldItemTooltipFade I
 	FIELD r currentStack Laxt;
 	FIELD s debugHud Lcrp;
 	FIELD t subtitlesHud Lcsd;
 	FIELD u spectatorHud Lcsl;
 	FIELD v scoreboardHud Lcrz;
 	FIELD w bossBarHud Lcrl;
+	FIELD x titleTotalTicks I
+	FIELD y title Ljava/lang/String;
+	FIELD z subtitle Ljava/lang/String;
+	METHOD a setDefaultTitleFade ()V
 	METHOD a draw (F)V
+	METHOD a renderMountJumpBar (I)V
+	METHOD a renderHotbarItem (IIFLary;Laxt;)V
+	METHOD a shouldRenderSpectatorCrosshair (Lcne;)Z
+	METHOD a renderScoreboardSidebar (Lcod;)V
 	METHOD a setRecordPlayingOverlay (Ljava/lang/String;)V
+	METHOD a setTitles (Ljava/lang/String;Ljava/lang/String;III)V
 	METHOD a setOverlayMessage (Ljava/lang/String;Z)V
 	METHOD a addChatMessage (Lje;Ljg;)V
 	METHOD a setOverlayMessage (Ljg;Z)V
+	METHOD b renderStatusEffectOverlay ()V
+	METHOD b renderHotbar (F)V
+	METHOD b renderExperienceBar (I)V
+	METHOD b renderVignetteOverlay (Lahl;)V
+	METHOD c renderHeldItemTooltip ()V
+	METHOD c renderCrosshair (F)V
 	METHOD d renderDemoTimer ()V
+	METHOD d renderPortalOverlay (F)V
 	METHOD e tick ()V
 	METHOD f getChatHud ()Lcrn;
 	METHOD g getTicks ()I
@@ -35,3 +55,7 @@ CLASS crc net/minecraft/client/gui/hud/InGameHud
 	METHOD l getBossBarHud ()Lcrl;
 	METHOD m resetDebugHudChunk ()V
 	METHOD n getCameraPlayer ()Lary;
+	METHOD o getRiddenEntity ()Lahu;
+	METHOD p renderStatusBars ()V
+	METHOD q drawMountHealth ()V
+	METHOD r renderPumpkinOverlay ()V

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

@@ -10,3 +10,4 @@ CLASS csd net/minecraft/client/gui/hud/SubtitlesHud
 	FIELD a client Lcqn;
 	FIELD f entries Ljava/util/List;
 	FIELD g enabled Z
+	METHOD a draw ()V

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

@@ -12,9 +12,12 @@ CLASS dfe net/minecraft/client/network/ClientPlayerEntity
 	METHOD A getServerBrand ()Ljava/lang/String;
 	METHOD B getStats ()Lyi;
 	METHOD D getRecipeBook ()Lcqg;
+	METHOD F hasJumpingMount ()Z
 	METHOD a setClientPermissionLevel (I)V
 	METHOD a onRecipeDisplayed (Lbad;)V
 	METHOD f sendChatMessage (Ljava/lang/String;)V
 	METHOD g setServerBrand (Ljava/lang/String;)V
 		ARG 1 serverBrand
 	METHOD s updateHealth (F)V
+	METHOD x startRidingJump ()V
+	METHOD z openRidingInventory ()V

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

@@ -37,6 +37,7 @@ CLASS dcs net/minecraft/client/network/ClientPlayerInteractionManager
 	METHOD a attackBlock (Les;Lew;)Z
 		ARG 1 pos
 	METHOD b cancelBlockBreaking ()V
+	METHOD b stopUsingItem (Lary;)V
 	METHOD b isCurrentlyBreaking (Les;)Z
 	METHOD c getReachDistance ()F
 	METHOD d tick ()V

mappings/net/minecraft/client/options/GameOptions.mapping

@@ -130,6 +130,7 @@ CLASS cqp net/minecraft/client/options/GameOptions
 	FIELD av client Lcqn;
 	FIELD aw difficulty Lage;
 	FIELD ax hudHidden Z
+	FIELD ay perspective I
 	FIELD az debugEnabled Z
 	FIELD b NARRATOR_SETTINGS [Ljava/lang/String;
 	FIELD c mouseSensitivity D

mappings/net/minecraft/entity/Entity.mapping

@@ -161,7 +161,9 @@ CLASS ahl net/minecraft/entity/Entity
 	METHOD a playSound (Lxx;FF)V
 		ARG 1 sound
 		ARG 2 volume
+	METHOD a isInFluid (Lyp;)Z
 	METHOD a isInFluid (Lyp;Z)Z
+		ARG 2 requireLoadedChunk
 	METHOD a toListTag ([D)Lib;
 	METHOD a toListTag ([F)Lib;
 	METHOD aA spawnSprintingParticles ()V
@@ -203,6 +205,7 @@ CLASS ahl net/minecraft/entity/Entity
 	METHOD as isInsideWaterOrRain ()Z
 	METHOD at isTouchingWater ()Z
 	METHOD au isInsideWaterOrBubbleColumn ()Z
+	METHOD av isInWater ()Z
 	METHOD ay onSwimmingStart ()V
 	METHOD az attemptSprintingParticles ()V
 	METHOD b setRenderDistanceMultiplier (D)V

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

@@ -52,17 +52,17 @@ CLASS ary net/minecraft/entity/player/PlayerEntity
 	METHOD a openHorseInventory (Lanu;Laga;)V
 	METHOD a shouldDamagePlayer (Lary;)Z
 	METHOD a isSkinOverlayVisible (Larz;)Z
-	METHOD a openBookEditorGui (Laxt;Lagg;)V
+	METHOD a openEditBookScreen (Laxt;Lagg;)V
 	METHOD a dropItem (Laxt;Z)Laps;
 		ARG 1 stack
 	METHOD a dropItem (Laxt;ZZ)Laps;
 		ARG 1 stack
-	METHOD a openCommandBlockMinecartGui (Lbci;)V
+	METHOD a openCommandBlockMinecartScreen (Lbci;)V
 	METHOD a setGameMode (Lbcy;)V
-	METHOD a openCommandBlockGui (Lbpi;)V
+	METHOD a openCommandBlockScreen (Lbpi;)V
-	METHOD a openJigsawGui (Lbpt;)V
+	METHOD a openJigsawScreen (Lbpt;)V
-	METHOD a openSignEditorGui (Lbpz;)V
+	METHOD a openEditSignScreen (Lbpz;)V
-	METHOD a openStructureBlockGui (Lbqd;)V
+	METHOD a openStructureBlockScreen (Lbqd;)V
 	METHOD a getUuidFromProfile (Lcom/mojang/authlib/GameProfile;)Ljava/util/UUID;
 		ARG 0 profile
 	METHOD a trySleep (Les;)Lary$a;

mappings/net/minecraft/item/SpawnEggItem.mapping

@@ -1 +1,4 @@
 CLASS ayt net/minecraft/item/SpawnEggItem
+	FIELD a SPAWN_EGGS Ljava/util/Map;
+	METHOD a forEntity (Lahp;)Layt;
+	METHOD d iterator ()Ljava/lang/Iterable;