mirror of https://github.com/FabricMC/yarn.git
Merge branch 'pull/766' into 1.14.3
# Conflicts: # mappings/net/minecraft/client/gui/screen/GameMenuScreen.mapping
This commit is contained in:
commit
3401fb4f27
|
@ -4,8 +4,8 @@ CLASS cwt net/minecraft/client/gui/hud/BossBarHud
|
|||
FIELD c bossBars Ljava/util/Map;
|
||||
METHOD <init> (Lcvo;)V
|
||||
ARG 1 client
|
||||
METHOD a draw ()V
|
||||
METHOD a drawBossBar (IILagw;)V
|
||||
METHOD a render ()V
|
||||
METHOD a renderBossBar (IILagw;)V
|
||||
ARG 1 x
|
||||
ARG 2 y
|
||||
ARG 3 bossBar
|
||||
|
|
|
@ -4,29 +4,39 @@ CLASS cwv net/minecraft/client/gui/hud/ChatHud
|
|||
FIELD c messageHistory Ljava/util/List;
|
||||
FIELD d messages Ljava/util/List;
|
||||
FIELD e visibleMessages Ljava/util/List;
|
||||
FIELD f scrolledLines I
|
||||
METHOD <init> (Lcvo;)V
|
||||
ARG 1 client
|
||||
METHOD a reset ()V
|
||||
METHOD a scroll (D)V
|
||||
ARG 1 amount
|
||||
METHOD a getText (DD)Ljn;
|
||||
ARG 1 x
|
||||
ARG 3 y
|
||||
METHOD a draw (I)V
|
||||
METHOD a render (I)V
|
||||
ARG 1 timestamp
|
||||
METHOD a addToMessageHistory (Ljava/lang/String;)V
|
||||
ARG 1 message
|
||||
METHOD a addMessage (Ljn;)V
|
||||
ARG 1 message
|
||||
METHOD a addMessage (Ljn;I)V
|
||||
ARG 1 message
|
||||
ARG 2 messageId
|
||||
METHOD a addMessage (Ljn;IIZ)V
|
||||
ARG 1 message
|
||||
ARG 2 messageId
|
||||
ARG 3 timestamp
|
||||
METHOD a clear (Z)V
|
||||
ARG 1 clearHistory
|
||||
METHOD b getMessageHistory ()Ljava/util/List;
|
||||
METHOD b getWidth (D)I
|
||||
ARG 0 widthOption
|
||||
METHOD b removeMessage (I)V
|
||||
ARG 1 messageId
|
||||
METHOD c getHeight (D)I
|
||||
ARG 0 heightOption
|
||||
METHOD d isChatFocused ()Z
|
||||
METHOD e getWidth ()I
|
||||
METHOD f getHeight ()I
|
||||
METHOD g getScale ()D
|
||||
METHOD g getChatScale ()D
|
||||
METHOD h getVisibleLineCount ()I
|
||||
|
|
|
@ -20,9 +20,9 @@ CLASS cwz net/minecraft/client/gui/hud/DebugHud
|
|||
ARG 2 startY
|
||||
ARG 3 firstSample
|
||||
ARG 4 isClient
|
||||
METHOD b draw ()V
|
||||
METHOD c drawLeftText ()V
|
||||
METHOD d drawRightText ()V
|
||||
METHOD b render ()V
|
||||
METHOD c renderLeftText ()V
|
||||
METHOD d renderRightText ()V
|
||||
METHOD e getLeftText ()Ljava/util/List;
|
||||
METHOD f getRightText ()Ljava/util/List;
|
||||
METHOD h getWorld ()Lbhm;
|
||||
|
|
|
@ -29,7 +29,8 @@ CLASS cwh net/minecraft/client/gui/hud/InGameHud
|
|||
METHOD <init> (Lcvo;)V
|
||||
ARG 1 client
|
||||
METHOD a setDefaultTitleFade ()V
|
||||
METHOD a draw (F)V
|
||||
METHOD a render (F)V
|
||||
ARG 1 tickDelta
|
||||
METHOD a renderMountJumpBar (I)V
|
||||
METHOD a renderHotbarItem (IIFLawb;Lbce;)V
|
||||
METHOD a shouldRenderSpectatorCrosshair (Lcrz;)Z
|
||||
|
@ -59,5 +60,5 @@ CLASS cwh net/minecraft/client/gui/hud/InGameHud
|
|||
METHOD o getCameraPlayer ()Lawb;
|
||||
METHOD p getRiddenEntity ()Laiu;
|
||||
METHOD q renderStatusBars ()V
|
||||
METHOD r drawMountHealth ()V
|
||||
METHOD r renderMountHealth ()V
|
||||
METHOD s renderPumpkinOverlay ()V
|
||||
|
|
|
@ -11,9 +11,16 @@ CLASS cxh net/minecraft/client/gui/hud/PlayerListHud
|
|||
ARG 1 client
|
||||
ARG 2 inGameHud
|
||||
METHOD a clear ()V
|
||||
METHOD a draw (ILctb;Lcsy;)V
|
||||
METHOD a renderLatencyIcon (IIILdhs;)V
|
||||
ARG 3 y
|
||||
ARG 4 playerEntry
|
||||
METHOD a render (ILctb;Lcsy;)V
|
||||
ARG 1 width
|
||||
ARG 2 scoreboard
|
||||
ARG 3 playerListScoreboardObjective
|
||||
METHOD a renderScoreboardObjective (Lcsy;ILjava/lang/String;IILdhs;)V
|
||||
METHOD a getPlayerName (Ldhs;)Ljn;
|
||||
ARG 1 playerEntry
|
||||
METHOD a setFooter (Ljn;)V
|
||||
ARG 1 footer
|
||||
METHOD a tick (Z)V
|
||||
|
|
|
@ -6,15 +6,16 @@ CLASS cxt net/minecraft/client/gui/hud/SpectatorHud
|
|||
FIELD e spectatorMenu Lddk;
|
||||
METHOD <init> (Lcvo;)V
|
||||
ARG 1 client
|
||||
METHOD a draw ()V
|
||||
METHOD a draw (F)V
|
||||
METHOD a drawSpectatorMenu (FIILddo;)V
|
||||
METHOD a render ()V
|
||||
METHOD a render (F)V
|
||||
ARG 1 tickDelta
|
||||
METHOD a renderSpectatorMenu (FIILddo;)V
|
||||
ARG 1 height
|
||||
ARG 2 x
|
||||
ARG 4 state
|
||||
METHOD a onHotbarKeyPress (I)V
|
||||
ARG 1 slot
|
||||
METHOD a drawSpectatorCommand (IIFFLddm;)V
|
||||
METHOD a renderSpectatorCommand (IIFFLddm;)V
|
||||
ARG 1 slot
|
||||
ARG 2 x
|
||||
ARG 3 y
|
||||
|
|
|
@ -3,11 +3,17 @@ CLASS cxl net/minecraft/client/gui/hud/SubtitlesHud
|
|||
FIELD b text Ljava/lang/String;
|
||||
FIELD c time J
|
||||
FIELD d pos Lcsb;
|
||||
METHOD <init> (Lcxl;Ljava/lang/String;Lcsb;)V
|
||||
ARG 2 text
|
||||
ARG 3 pos
|
||||
METHOD a getText ()Ljava/lang/String;
|
||||
METHOD a reset (Lcsb;)V
|
||||
ARG 1 pos
|
||||
METHOD b getTime ()J
|
||||
METHOD c getPosition ()Lcsb;
|
||||
FIELD a client Lcvo;
|
||||
FIELD b entries Ljava/util/List;
|
||||
FIELD c enabled Z
|
||||
METHOD a draw ()V
|
||||
METHOD <init> (Lcvo;)V
|
||||
ARG 1 client
|
||||
METHOD a render ()V
|
||||
|
|
|
@ -5,4 +5,4 @@ CLASS ddm net/minecraft/client/gui/hud/spectator/SpectatorMenuCommand
|
|||
ARG 2 alpha
|
||||
METHOD a use (Lddk;)V
|
||||
ARG 1 menu
|
||||
METHOD aa_ enabled ()Z
|
||||
METHOD aa_ isEnabled ()Z
|
||||
|
|
|
@ -5,6 +5,7 @@ CLASS czh net/minecraft/client/gui/screen/AddServerScreen
|
|||
FIELD d addressField Lcxa;
|
||||
FIELD e serverNameField Lcxa;
|
||||
FIELD f resourcePackOptionButton Lcwu;
|
||||
FIELD g addressTextFilter Ljava/util/function/Predicate;
|
||||
METHOD <init> (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Ldhu;)V
|
||||
ARG 1 callback
|
||||
ARG 2 serverEntry
|
||||
|
|
|
@ -36,11 +36,16 @@ CLASS cyx net/minecraft/client/gui/screen/ChatScreen
|
|||
FIELD c commandExceptionsX I
|
||||
FIELD d commandExceptionsWidth I
|
||||
FIELD e WHITESPACE_PATTERN Ljava/util/regex/Pattern;
|
||||
FIELD g messageHistorySize I
|
||||
FIELD h originalChatText Ljava/lang/String;
|
||||
FIELD i parseResults Lcom/mojang/brigadier/ParseResults;
|
||||
FIELD j suggestionsFuture Ljava/util/concurrent/CompletableFuture;
|
||||
FIELD k suggestionsWindow Lcyx$a;
|
||||
FIELD m completingSuggestion Z
|
||||
METHOD <init> (Ljava/lang/String;)V
|
||||
ARG 1 originalChatText
|
||||
METHOD a showSuggestions ()V
|
||||
METHOD a setChatFromHistory (I)V
|
||||
METHOD a getRenderText (Lcom/mojang/brigadier/ParseResults;Ljava/lang/String;I)Ljava/lang/String;
|
||||
ARG 0 parseResults
|
||||
ARG 1 typedText
|
||||
|
|
|
@ -5,6 +5,11 @@ CLASS cyz net/minecraft/client/gui/screen/ConfirmScreen
|
|||
FIELD d message Ljn;
|
||||
FIELD e messageSplit Ljava/util/List;
|
||||
FIELD f buttonEnableTimer I
|
||||
METHOD <init> (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Ljn;Ljn;Ljava/lang/String;Ljava/lang/String;)V
|
||||
ARG 1 callback
|
||||
ARG 3 message
|
||||
ARG 4 yesTranslated
|
||||
ARG 5 noTranslated
|
||||
METHOD a disableButtons (I)V
|
||||
METHOD keyPressed (III)Z
|
||||
ARG 1 keyCode
|
||||
|
|
|
@ -1,11 +1,24 @@
|
|||
CLASS cza net/minecraft/client/gui/screen/ConnectScreen
|
||||
FIELD a CONNECTOR_THREADS_COUNT Ljava/util/concurrent/atomic/AtomicInteger;
|
||||
FIELD b LOGGER Lorg/apache/logging/log4j/Logger;
|
||||
FIELD c connection Ljb;
|
||||
FIELD d connectingCancelled Z
|
||||
FIELD e parent Lczx;
|
||||
FIELD f status Ljn;
|
||||
METHOD <init> (Lczx;Lcvo;Ldhu;)V
|
||||
ARG 1 parent
|
||||
ARG 2 client
|
||||
ARG 3 entry
|
||||
METHOD <init> (Lczx;Lcvo;Ljava/lang/String;I)V
|
||||
ARG 1 parent
|
||||
ARG 2 client
|
||||
ARG 3 address
|
||||
ARG 4 port
|
||||
METHOD a connect (Ljava/lang/String;I)V
|
||||
ARG 1 address
|
||||
ARG 2 port
|
||||
METHOD a setStatus (Ljn;)V
|
||||
ARG 1 status
|
||||
METHOD render (IIF)V
|
||||
ARG 1 mouseX
|
||||
ARG 2 mouseY
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
CLASS czt net/minecraft/client/gui/screen/GameMenuScreen
|
||||
METHOD a initWidgets ()V
|
||||
METHOD render (IIF)V
|
||||
ARG 1 mouseX
|
||||
ARG 2 mouseY
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
CLASS czl net/minecraft/client/gui/screen/LanguageOptionsScreen
|
||||
CLASS a LanguageSelectionListWidget
|
||||
CLASS a LanguageItem
|
||||
CLASS a LanguageEntry
|
||||
FIELD b languageDefinition Ldvk;
|
||||
METHOD <init> (Lczl$a;Ldvk;)V
|
||||
ARG 2 languageDefinition
|
||||
|
|
|
@ -1,6 +1,10 @@
|
|||
CLASS czm net/minecraft/client/gui/screen/LevelLoadingScreen
|
||||
FIELD a progressProvider Lvv;
|
||||
FIELD c STATUS_TO_COLOR Lit/unimi/dsi/fastutil/objects/Object2IntMap;
|
||||
METHOD <init> (Lvv;)V
|
||||
ARG 1 progressProvider
|
||||
METHOD a (Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap;)V
|
||||
ARG 0 map
|
||||
METHOD a drawChunkMap (Lvv;IIII)V
|
||||
ARG 0 progressProvider
|
||||
ARG 1 centerX
|
||||
|
|
|
@ -2,6 +2,8 @@ CLASS czp net/minecraft/client/gui/screen/MouseOptionsScreen
|
|||
FIELD a parent Lczx;
|
||||
FIELD b buttonList Lcxg;
|
||||
FIELD c OPTIONS [Lcvr;
|
||||
METHOD <init> (Lczx;)V
|
||||
ARG 1 parent
|
||||
METHOD render (IIF)V
|
||||
ARG 1 mouseX
|
||||
ARG 2 mouseY
|
||||
|
|
|
@ -1,7 +1,15 @@
|
|||
CLASS czu net/minecraft/client/gui/screen/PresetsScreen
|
||||
CLASS a SuperflatPreset
|
||||
FIELD a icon Lbbz;
|
||||
FIELD b name Ljava/lang/String;
|
||||
FIELD c config Ljava/lang/String;
|
||||
METHOD <init> (Lbbz;Ljava/lang/String;Ljava/lang/String;)V
|
||||
ARG 1 icon
|
||||
ARG 2 name
|
||||
ARG 3 config
|
||||
CLASS b SuperflatPresetsListWidget
|
||||
CLASS a SuperflatPresetItem
|
||||
CLASS a SuperflatPresetEntry
|
||||
METHOD a setPreset ()V
|
||||
METHOD mouseClicked (DDI)Z
|
||||
ARG 1 mouseX
|
||||
ARG 3 mouseY
|
||||
|
@ -14,10 +22,19 @@ CLASS czu net/minecraft/client/gui/screen/PresetsScreen
|
|||
FIELD b parent Lczc;
|
||||
FIELD c shareText Ljava/lang/String;
|
||||
FIELD d listText Ljava/lang/String;
|
||||
FIELD e listWidget Lczu$b;
|
||||
FIELD f selectPresetButton Lcwu;
|
||||
FIELD g customPresetField Lcxa;
|
||||
METHOD <init> (Lczc;)V
|
||||
ARG 1 parent
|
||||
METHOD a addPreset (Ljava/lang/String;Lbhl;Lbij;Ljava/util/List;[Lcfr;)V
|
||||
ARG 0 name
|
||||
ARG 1 icon
|
||||
ARG 2 biome
|
||||
ARG 3 structures
|
||||
ARG 4 layers
|
||||
METHOD a updateSelectButton (Z)V
|
||||
ARG 1 hasSelected
|
||||
METHOD mouseScrolled (DDD)Z
|
||||
ARG 5 amount
|
||||
METHOD render (IIF)V
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
CLASS cwx net/minecraft/client/util/TextComponentUtil
|
||||
METHOD a (Ljava/lang/String;Z)Ljava/lang/String;
|
||||
METHOD a getRenderChatMessage (Ljava/lang/String;Z)Ljava/lang/String;
|
||||
ARG 0 string
|
||||
ARG 1 forceColor
|
||||
METHOD a wrapLines (Ljn;ILcwg;ZZ)Ljava/util/List;
|
||||
|
|
Loading…
Reference in New Issue