mirror of https://github.com/FabricMC/yarn.git
Merge branch 'pull/531' into 19w11b
# Conflicts: # mappings/net/minecraft/client/gui/menu/ErrorScreen.mapping # mappings/net/minecraft/client/options/GameOption.mapping
This commit is contained in:
modmuss50
commit
ff84b02ba0
|
|
@ -4,5 +4,8 @@ CLASS cwd net/minecraft/client/font/FontManager
|
|||
FIELD c fonts Ljava/util/Set;
|
||||
FIELD d textureManager Ldtc;
|
||||
FIELD e forceUnicodeFont Z
|
||||
FIELD f resourceReloadListener Lwv;
|
||||
METHOD a getResourceReloadListener ()Lwv;
|
||||
METHOD a getTextRenderer (Lqp;)Lcuh;
|
||||
METHOD a setForceUnicodeFont (ZLjava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)V
|
||||
ARG 1 forceUnicodeFont
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ CLASS cuh net/minecraft/client/font/TextRenderer
|
|||
ARG 7 blue
|
||||
ARG 8 alpha
|
||||
METHOD a draw (Lcsr;)V
|
||||
ARG 1 bufferBuilder
|
||||
FIELD a fontHeight I
|
||||
FIELD b random Ljava/util/Random;
|
||||
FIELD c textureManager Ldtc;
|
||||
|
|
@ -28,6 +29,7 @@ CLASS cuh net/minecraft/client/font/TextRenderer
|
|||
ARG 2 fontStorage
|
||||
METHOD a isRightToLeft ()Z
|
||||
METHOD a getCharWidth (C)F
|
||||
ARG 1 character
|
||||
METHOD a drawGlyph (Lcwh;ZZFFFLcsr;FFFF)V
|
||||
ARG 1 glyphRenderer
|
||||
ARG 2 bold
|
||||
|
|
@ -41,10 +43,12 @@ CLASS cuh net/minecraft/client/font/TextRenderer
|
|||
ARG 10 blue
|
||||
ARG 11 alpha
|
||||
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 draw (Ljava/lang/String;FFIZ)I
|
||||
ARG 1 str
|
||||
ARG 2 x
|
||||
|
|
@ -72,10 +76,12 @@ CLASS cuh net/minecraft/client/font/TextRenderer
|
|||
ARG 1 fonts
|
||||
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 drawLayer (Ljava/lang/String;FFIZ)F
|
||||
ARG 1 str
|
||||
ARG 2 x
|
||||
|
|
@ -90,6 +96,7 @@ CLASS cuh net/minecraft/client/font/TextRenderer
|
|||
ARG 3 y
|
||||
ARG 4 maxWidth
|
||||
METHOD c trimEndNewlines (Ljava/lang/String;)Ljava/lang/String;
|
||||
ARG 1 string
|
||||
METHOD c wrapStringToWidthAsList (Ljava/lang/String;I)Ljava/util/List;
|
||||
ARG 1 text
|
||||
METHOD d wrapStringToWidth (Ljava/lang/String;I)Ljava/lang/String;
|
||||
|
|
|
|||
|
|
@ -10,11 +10,21 @@ CLASS csm net/minecraft/client/gl/GlBlendState
|
|||
METHOD <init> (III)V
|
||||
ARG 1 srcRgb
|
||||
ARG 2 dstRgb
|
||||
ARG 3 func
|
||||
METHOD <init> (IIIII)V
|
||||
ARG 1 srcRgb
|
||||
ARG 2 dstRgb
|
||||
ARG 3 srcAlpha
|
||||
ARG 4 dstAlpha
|
||||
ARG 5 func
|
||||
METHOD <init> (ZZIIIII)V
|
||||
ARG 1 separateBlend
|
||||
ARG 2 blendDisabled
|
||||
ARG 3 srcRgb
|
||||
ARG 4 dstRgb
|
||||
ARG 5 srcAlpha
|
||||
ARG 6 dstAlpha
|
||||
ARG 7 func
|
||||
METHOD a enable ()V
|
||||
METHOD a getFuncFromString (Ljava/lang/String;)I
|
||||
METHOD b isBlendDisabled ()Z
|
||||
|
|
|
|||
|
|
@ -2,8 +2,11 @@ CLASS csv net/minecraft/client/gl/GlBuffer
|
|||
FIELD a id I
|
||||
FIELD b format Lcsx;
|
||||
FIELD c vertexCount I
|
||||
METHOD <init> (Lcsx;)V
|
||||
ARG 1 format
|
||||
METHOD a bind ()V
|
||||
METHOD a draw (I)V
|
||||
METHOD a set (Ljava/nio/ByteBuffer;)V
|
||||
ARG 1 buffer
|
||||
METHOD b unbind ()V
|
||||
METHOD c delete ()V
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ CLASS cyz net/minecraft/client/gui/AbstractCommandBlockScreen
|
|||
FIELD w parsedCommand Lcom/mojang/brigadier/ParseResults;
|
||||
FIELD z suggestionsDisabled Z
|
||||
METHOD a syncSettingsToServer (Lbfe;)V
|
||||
ARG 1 commandExecutor
|
||||
METHOD a setCommand (Ljava/lang/String;)V
|
||||
ARG 1 command
|
||||
METHOD b onCommandChanged (Ljava/lang/String;)V
|
||||
|
|
|
|||
|
|
@ -1,2 +1,4 @@
|
|||
CLASS dac net/minecraft/client/gui/CommandBlockMinecartScreen
|
||||
FIELD z commandExecutor Lbfe;
|
||||
METHOD <init> (Lbfe;)V
|
||||
ARG 1 commandExecutor
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@ CLASS czj net/minecraft/client/gui/CommandBlockScreen
|
|||
FIELD E conditional Z
|
||||
FIELD F autoActivate Z
|
||||
FIELD z blockEntity Lbse;
|
||||
METHOD <init> (Lbse;)V
|
||||
ARG 1 blockEntity
|
||||
METHOD A updateConditionalMode ()V
|
||||
METHOD B updateActivationMode ()V
|
||||
METHOD y updateMode ()V
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ CLASS dix net/minecraft/client/gui/CubeMapRenderer
|
|||
METHOD <init> (Lqp;)V
|
||||
ARG 1 faces
|
||||
METHOD a draw (Lctp;FFF)V
|
||||
ARG 1 client
|
||||
ARG 2 x
|
||||
ARG 3 y
|
||||
ARG 4 alpha
|
||||
|
|
|
|||
|
|
@ -12,3 +12,4 @@ CLASS cvo net/minecraft/client/gui/MultiInputListener
|
|||
METHOD f getFocused (I)Lcvp;
|
||||
ARG 1 startPos
|
||||
METHOD q focusNext ()V
|
||||
METHOD r focusPrevious ()V
|
||||
|
|
|
|||
|
|
@ -41,9 +41,12 @@ CLASS cyg net/minecraft/client/gui/Screen
|
|||
ARG 2 width
|
||||
ARG 3 height
|
||||
METHOD b sendMessage (Ljava/lang/String;Z)V
|
||||
ARG 1 message
|
||||
METHOD c onInitialized ()V
|
||||
METHOD c drawTextureBackground (I)V
|
||||
ARG 1 alpha
|
||||
METHOD c_ drawBackground (I)V
|
||||
ARG 1 alpha
|
||||
METHOD confirmResult (ZI)V
|
||||
ARG 1 result
|
||||
METHOD d drawBackground ()V
|
||||
|
|
|
|||
|
|
@ -2,11 +2,15 @@ CLASS cus net/minecraft/client/gui/hud/BossBarHud
|
|||
FIELD a BAR_TEX Lqp;
|
||||
FIELD b client Lctp;
|
||||
FIELD g bossBars Ljava/util/Map;
|
||||
METHOD <init> (Lctp;)V
|
||||
ARG 1 client
|
||||
METHOD a draw ()V
|
||||
METHOD a drawBossBar (IILagh;)V
|
||||
ARG 1 x
|
||||
ARG 2 y
|
||||
ARG 3 bossBar
|
||||
METHOD a handlePacket (Lkp;)V
|
||||
ARG 1 packet
|
||||
METHOD b clear ()V
|
||||
METHOD d shouldPlayDragonMusic ()Z
|
||||
METHOD e shouldDarkenSky ()Z
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@ CLASS cuu net/minecraft/client/gui/hud/ChatHud
|
|||
FIELD b client Lctp;
|
||||
FIELD h messages Ljava/util/List;
|
||||
FIELD i visibleMessages Ljava/util/List;
|
||||
METHOD <init> (Lctp;)V
|
||||
ARG 1 client
|
||||
METHOD a reset ()V
|
||||
METHOD a getTextComponentAt (DD)Ljl;
|
||||
ARG 1 x
|
||||
|
|
|
|||
|
|
@ -2,6 +2,10 @@ CLASS ctl net/minecraft/client/gui/hud/ChatHudLine
|
|||
FIELD a tickCreated I
|
||||
FIELD b contents Ljl;
|
||||
FIELD c id I
|
||||
METHOD <init> (ILjl;I)V
|
||||
ARG 1 tickCreated
|
||||
ARG 2 contents
|
||||
ARG 3 id
|
||||
METHOD a getContents ()Ljl;
|
||||
METHOD b getTickCreated ()I
|
||||
METHOD c getId ()I
|
||||
|
|
|
|||
|
|
@ -1,2 +1,4 @@
|
|||
CLASS cuo net/minecraft/client/gui/hud/ChatListenerHud
|
||||
FIELD a client Lctp;
|
||||
METHOD <init> (Lctp;)V
|
||||
ARG 1 client
|
||||
|
|
|
|||
|
|
@ -1,4 +1,7 @@
|
|||
CLASS cvb net/minecraft/client/gui/hud/ClientBossBar
|
||||
FIELD h healthLatest F
|
||||
FIELD i timeHealthSet J
|
||||
METHOD <init> (Lkp;)V
|
||||
ARG 1 packet
|
||||
METHOD a handlePacket (Lkp;)V
|
||||
ARG 1 packet
|
||||
|
|
|
|||
|
|
@ -26,6 +26,8 @@ CLASS cui net/minecraft/client/gui/hud/InGameHud
|
|||
FIELD x titleTotalTicks I
|
||||
FIELD y title Ljava/lang/String;
|
||||
FIELD z subtitle Ljava/lang/String;
|
||||
METHOD <init> (Lctp;)V
|
||||
ARG 1 client
|
||||
METHOD a setDefaultTitleFade ()V
|
||||
METHOD a draw (F)V
|
||||
METHOD a renderMountJumpBar (I)V
|
||||
|
|
|
|||
|
|
@ -6,4 +6,5 @@ CLASS cxh net/minecraft/client/gui/ingame/ConfirmChatLinkScreen
|
|||
METHOD <init> (Lcxi;Ljava/lang/String;IZ)V
|
||||
ARG 1 callback
|
||||
ARG 2 link
|
||||
ARG 4 drawWarning
|
||||
METHOD j copyToClipboard ()V
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
CLASS cxn net/minecraft/client/gui/ingame/DeathScreen
|
||||
FIELD a ticksSinceDeath I
|
||||
FIELD b msg Ljl;
|
||||
FIELD b message Ljl;
|
||||
METHOD <init> (Ljl;)V
|
||||
ARG 1 message
|
||||
METHOD confirmResult (ZI)V
|
||||
ARG 1 result
|
||||
|
|
|
|||
|
|
@ -3,3 +3,6 @@ CLASS daf net/minecraft/client/gui/ingame/EditSignScreen
|
|||
FIELD b ticksSinceOpened I
|
||||
FIELD g currentRow I
|
||||
FIELD h selectionManager Lcwg;
|
||||
METHOD <init> (Lbsv;)V
|
||||
ARG 1 sign
|
||||
METHOD k finishEditing ()V
|
||||
|
|
|
|||
|
|
@ -6,5 +6,7 @@ CLASS czw net/minecraft/client/gui/ingame/PlayerInventoryScreen
|
|||
FIELD E isNarrow Z
|
||||
FIELD F isMouseDown Z
|
||||
FIELD z RECIPE_BUTTON_TEX Lqp;
|
||||
METHOD <init> (Laun;)V
|
||||
ARG 1 player
|
||||
METHOD a drawEntity (IIIFFLaif;)V
|
||||
ARG 5 entity
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@ CLASS dai net/minecraft/client/gui/ingame/StructureBlockScreen
|
|||
FIELD B inputIntegrity Lcux;
|
||||
FIELD C inputSeed Lcux;
|
||||
FIELD D inputMetadata Lcux;
|
||||
FIELD E doneButton Lcut;
|
||||
FIELD F cancelButton Lcut;
|
||||
FIELD E buttonDone Lcut;
|
||||
FIELD F buttonCancel Lcut;
|
||||
FIELD G buttonSave Lcut;
|
||||
FIELD H buttonLoad Lcut;
|
||||
FIELD I buttonRotate0 Lcut;
|
||||
|
|
@ -31,9 +31,13 @@ CLASS dai net/minecraft/client/gui/ingame/StructureBlockScreen
|
|||
FIELD x inputPosZ Lcux;
|
||||
FIELD y inputSizeX Lcux;
|
||||
FIELD z inputSizeY Lcux;
|
||||
METHOD <init> (Lbsz;)V
|
||||
ARG 1 structureBlock
|
||||
METHOD a parseLong (Ljava/lang/String;)J
|
||||
METHOD b parseFloat (Ljava/lang/String;)F
|
||||
METHOD c parseInt (Ljava/lang/String;)I
|
||||
METHOD k done ()V
|
||||
METHOD l cancel ()V
|
||||
METHOD m updateIgnoreEntitiesButton ()V
|
||||
METHOD n updateShowAirButton ()V
|
||||
METHOD o updateShowBoundingBoxButton ()V
|
||||
|
|
|
|||
|
|
@ -1,2 +1,5 @@
|
|||
CLASS dbr net/minecraft/client/gui/ingame/UpdateWorldScreen
|
||||
FIELD b callback Lcxi;
|
||||
FIELD g updater Lagf;
|
||||
METHOD <init> (Lcxi;Ljava/lang/String;Lcmo;)V
|
||||
ARG 1 ballback
|
||||
|
|
|
|||
|
|
@ -3,5 +3,10 @@ CLASS cxp net/minecraft/client/gui/menu/DirectConnectServerScreen
|
|||
FIELD b parent Lcyg;
|
||||
FIELD g serverEntry Ldgi;
|
||||
FIELD h addressField Lcux;
|
||||
METHOD <init> (Lcyg;Ldgi;)V
|
||||
ARG 1 parent
|
||||
ARG 2 serverEntry
|
||||
METHOD a (Ljava/lang/String;)V
|
||||
ARG 1 text
|
||||
METHOD k saveAndClose ()V
|
||||
METHOD l onAddressFieldChanged ()V
|
||||
|
|
|
|||
|
|
@ -7,3 +7,4 @@ CLASS cxq net/minecraft/client/gui/menu/DisconnectedScreen
|
|||
METHOD <init> (Lcyg;Ljava/lang/String;Ljl;)V
|
||||
ARG 1 parent
|
||||
ARG 2 title
|
||||
ARG 3 reason
|
||||
|
|
|
|||
|
|
@ -1 +1,6 @@
|
|||
CLASS cxd net/minecraft/client/gui/menu/ErrorScreen
|
||||
CLASS cxs net/minecraft/client/gui/menu/ErrorScreen
|
||||
FIELD a title Ljava/lang/String;
|
||||
FIELD b message Ljava/lang/String;
|
||||
METHOD <init> (Ljava/lang/String;Ljava/lang/String;)V
|
||||
ARG 1 title
|
||||
ARG 2 message
|
||||
|
|
|
|||
|
|
@ -1,6 +1,12 @@
|
|||
CLASS dal net/minecraft/client/gui/menu/MultiplayerScreen
|
||||
FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
|
||||
FIELD g parent Lcyg;
|
||||
FIELD h serverListWidget Ldap;
|
||||
FIELD s buttonEdit Lcut;
|
||||
FIELD t buttonSelect Lcut;
|
||||
FIELD u buttonDelete Lcut;
|
||||
METHOD <init> (Lcyg;)V
|
||||
ARG 1 parent
|
||||
METHOD b setIndex (I)V
|
||||
METHOD confirmResult (ZI)V
|
||||
ARG 1 result
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
CLASS cyn net/minecraft/client/gui/menu/StatsScreen
|
||||
FIELD a parent Lcyg;
|
||||
FIELD s statHandler Lyq;
|
||||
FIELD t listWidget Lcvh;
|
||||
METHOD <init> (Lcyg;Lyq;)V
|
||||
ARG 1 parent
|
||||
ARG 2 statHandler
|
||||
|
|
|
|||
|
|
@ -11,10 +11,12 @@ CLASS cxj net/minecraft/client/gui/menu/YesNoScreen
|
|||
ARG 1 callback
|
||||
ARG 2 title
|
||||
ARG 3 message
|
||||
ARG 4 callbackId
|
||||
METHOD <init> (Lcxi;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V
|
||||
ARG 1 callback
|
||||
ARG 2 title
|
||||
ARG 3 message
|
||||
ARG 4 yesTranslated
|
||||
ARG 5 noTranslated
|
||||
ARG 6 callbackId
|
||||
METHOD b disableButtons (I)V
|
||||
|
|
|
|||
|
|
@ -4,3 +4,4 @@ CLASS cyj net/minecraft/client/gui/menu/settings/AudioSettingsScreen
|
|||
FIELD g settings Lctt;
|
||||
METHOD <init> (Lcyg;Lctt;)V
|
||||
ARG 1 parent
|
||||
ARG 2 settings
|
||||
|
|
|
|||
|
|
@ -4,3 +4,4 @@ CLASS cxf net/minecraft/client/gui/menu/settings/ChatSettingsScreen
|
|||
FIELD g settings Lctt;
|
||||
METHOD <init> (Lcyg;Lctt;)V
|
||||
ARG 1 parent
|
||||
ARG 2 settings
|
||||
|
|
|
|||
|
|
@ -1,10 +1,20 @@
|
|||
CLASS cxv net/minecraft/client/gui/menu/settings/LanguageSettingsScreen
|
||||
CLASS cxv$a LanguageSelectionEntry
|
||||
FIELD d languageDefinition Ldty;
|
||||
METHOD <init> (Lcxv;Ldty;)V
|
||||
ARG 2 languageDefinition
|
||||
METHOD b onPressed ()V
|
||||
CLASS cxv$b LanguageSelectionListWidget
|
||||
METHOD <init> (Lcxv;Lctp;)V
|
||||
ARG 2 client
|
||||
FIELD a parent Lcyg;
|
||||
FIELD b languageSelectionList Lcxv$b;
|
||||
FIELD g settings Lctt;
|
||||
FIELD h languageManager Ldtz;
|
||||
FIELD i forceUnicodeButton Lcve;
|
||||
FIELD s doneButton Lcut;
|
||||
FIELD t selectedIndex I
|
||||
METHOD <init> (Lcyg;Lctt;Ldtz;)V
|
||||
ARG 1 parent
|
||||
ARG 2 settings
|
||||
ARG 3 languageManager
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
CLASS cyi net/minecraft/client/gui/menu/settings/SkinSettingsScreen
|
||||
FIELD a parent Lcyg;
|
||||
FIELD b title Ljava/lang/String;
|
||||
METHOD <init> (Lcyg;)V
|
||||
ARG 1 parent
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
CLASS cuq net/minecraft/client/gui/widget/AbstractButtonWidget
|
||||
FIELD a text Ljava/lang/String;
|
||||
FIELD b focused Z
|
||||
FIELD g WIDGET_TEX Lqp;
|
||||
FIELD h width I
|
||||
FIELD i height I
|
||||
|
|
@ -11,6 +10,7 @@ CLASS cuq net/minecraft/client/gui/widget/AbstractButtonWidget
|
|||
FIELD n opacity F
|
||||
FIELD o nextNarrationTime J
|
||||
FIELD p hovered Z
|
||||
FIELD q hasFocus Z
|
||||
METHOD <init> (IIIILjava/lang/String;)V
|
||||
ARG 1 x
|
||||
ARG 2 y
|
||||
|
|
|
|||
|
|
@ -2,15 +2,20 @@ CLASS cvh net/minecraft/client/gui/widget/AbstractListWidget
|
|||
FIELD a client Lctp;
|
||||
FIELD b width I
|
||||
FIELD g height I
|
||||
FIELD h y1 I
|
||||
FIELD i y2 I
|
||||
FIELD j x2 I
|
||||
FIELD k x1 I
|
||||
FIELD h y I
|
||||
FIELD i bottom I
|
||||
FIELD j right I
|
||||
FIELD k x I
|
||||
FIELD l entryHeight I
|
||||
FIELD o scrollY D
|
||||
FIELD p visible Z
|
||||
METHOD <init> (Lctp;IIIII)V
|
||||
ARG 1 client
|
||||
ARG 2 width
|
||||
ARG 3 height
|
||||
ARG 4 y
|
||||
ARG 5 bottom
|
||||
ARG 6 entryHeight
|
||||
METHOD a drawBackground ()V
|
||||
METHOD a isSelectedEntry (I)Z
|
||||
ARG 1 index
|
||||
|
|
@ -34,8 +39,8 @@ CLASS cvh net/minecraft/client/gui/widget/AbstractListWidget
|
|||
METHOD c (IIII)V
|
||||
ARG 1 width
|
||||
ARG 2 height
|
||||
ARG 3 y1
|
||||
ARG 4 y2
|
||||
ARG 3 y
|
||||
ARG 4 bottom
|
||||
METHOD d getEntryCount ()I
|
||||
METHOD d getSelectedEntry (DD)I
|
||||
METHOD d renderCoverBackground (IIII)V
|
||||
|
|
|
|||
|
|
@ -5,4 +5,5 @@ CLASS dan net/minecraft/client/gui/widget/LocalServerListEntry
|
|||
FIELD f lastUpdateMillis J
|
||||
METHOD <init> (Ldal;Ldwc;)V
|
||||
ARG 1 gui
|
||||
ARG 2 entry
|
||||
METHOD b getLanServerEntry ()Ldwc;
|
||||
|
|
|
|||
|
|
@ -1,2 +1,4 @@
|
|||
CLASS cul net/minecraft/client/sortme/ClientChatListener
|
||||
METHOD a onChatMessage (Ljj;Ljl;)V
|
||||
ARG 1 messageType
|
||||
ARG 2 message
|
||||
|
|
|
|||
Loading…
Reference in New Issue