Screen Narration stuff (#2425)

* Screen Narration stuff

* Function name fixes, removed semi-outdated documentation

* Update mappings/net/minecraft/client/gui/screen/narration/NarrationMessageBuilder.mapping

Co-authored-by: liach <7806504+liach@users.noreply.github.com>

* Update mappings/net/minecraft/client/gui/screen/Screen.mapping

Co-authored-by: liach <7806504+liach@users.noreply.github.com>

* getTitleNarrationMessage -> getNarratedTitle

* net/minecraft/util/ToStringTransformer -> net/minecraft/client/gui/screen/narration/ToStringTransformer

* ToStringTransformer -> Narration

* Update mappings/net/minecraft/client/gui/screen/narration/Narration.mapping

Co-authored-by: liach <7806504+liach@users.noreply.github.com>

* Update mappings/net/minecraft/client/gui/screen/narration/Narration.mapping

Co-authored-by: liach <7806504+liach@users.noreply.github.com>

* Readd lost in merge Screen::remove

* Keep existing clearChildren name

* Update mappings/net/minecraft/client/gui/screen/narration/Narration.mapping

Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com>

* Update mappings/net/minecraft/client/gui/screen/Screen.mapping

Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com>

Co-authored-by: liach <7806504+liach@users.noreply.github.com>
Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com>
This commit is contained in:
Alexander 2021-05-26 13:08:37 +03:00 committed by GitHub
parent 3e70d627b7
commit 8e7ee74ad5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 120 additions and 10 deletions

View File

@ -0,0 +1,3 @@
CLASS net/minecraft/class_6383 net/minecraft/client/gui/Narratable
METHOD method_37020 appendNarrations (Lnet/minecraft/class_6382;)V
ARG 1 builder

View File

@ -0,0 +1,4 @@
CLASS net/minecraft/class_6379 net/minecraft/client/gui/Selectable
METHOD method_37018 getType ()Lnet/minecraft/class_6379$class_6380;
CLASS class_6380 SelectionType
METHOD method_37028 isFocused ()Z

View File

@ -10,7 +10,15 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen
FIELD field_22790 height I
FIELD field_22792 passEvents Z
FIELD field_22793 textRenderer Lnet/minecraft/class_327;
FIELD field_33813 selected Lnet/minecraft/class_6379;
FIELD field_33814 SCREEN_USAGE_TEXT Lnet/minecraft/class_2561;
FIELD field_33815 selectables Ljava/util/List;
FIELD field_33816 drawables Ljava/util/List;
FIELD field_33817 SCREEN_INIT_NARRATION_DELAY J
FIELD field_33818 NARRATOR_MODE_CHANGE_DELAY J
FIELD field_33822 narrator Lnet/minecraft/class_6385;
FIELD field_33823 elementNarrationStartTime J
FIELD field_33824 screenNarrationStartTime J
METHOD <init> (Lnet/minecraft/class_2561;)V
ARG 1 title
METHOD method_25393 tick ()V
@ -78,12 +86,7 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen
ARG 1 message
METHOD method_25428 confirmLink (Z)V
ARG 1 open
METHOD method_25429 addChild (Lnet/minecraft/class_364;)Lnet/minecraft/class_364;
COMMENT Adds a child element to this screen.
COMMENT If the child element is an {@link net.minecraft.client.gui.widget.AbstractButtonWidget}, you should use {@link Screen#addButton(AbstractButtonWidget)} instead.
COMMENT
COMMENT <p>Adding a child element to a screen does not guarantee the widget is rendered or ticked.
COMMENT @see net.minecraft.client.gui.screen.Screen#addButton(AbstractButtonWidget)
METHOD method_25429 addSelectableChild (Lnet/minecraft/class_364;)Lnet/minecraft/class_364;
ARG 1 child
METHOD method_25430 handleTextClick (Lnet/minecraft/class_2583;)Z
ARG 1 style
@ -100,7 +103,7 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen
COMMENT Renders the fullscreen {@linkplain net.minecraft.client.gui.DrawableHelper#OPTIONS_BACKGROUND_TEXTURE background texture} of this screen.
ARG 1 vOffset
COMMENT an offset applied to the V coordinate of the background texture
METHOD method_25435 getNarrationMessage ()Lnet/minecraft/class_2561;
METHOD method_25435 getNarratedTitle ()Lnet/minecraft/class_2561;
METHOD method_25436 isCut (I)Z
ARG 0 code
METHOD method_25437 isPaste (I)Z
@ -133,7 +136,40 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen
ARG 5 y
METHOD method_32635 (Ljava/util/List;Lnet/minecraft/class_5632;)V
ARG 1 data
METHOD method_37056 addElementNarrations (Lnet/minecraft/class_6382;)V
ARG 1 builder
METHOD method_37058 setElementNarrationDelay (J)V
ARG 1 delayMs
METHOD method_37059 setScreenNarrationDelay (JZ)V
ARG 1 delayMs
ARG 3 restartElementNarration
METHOD method_37060 addDrawable (Lnet/minecraft/class_4068;)Lnet/minecraft/class_4068;
ARG 1 drawable
METHOD method_37061 findSelectedElementData (Ljava/util/List;Lnet/minecraft/class_6379;)Lnet/minecraft/class_437$class_6390;
ARG 0 selectables
ARG 1 selectable
METHOD method_37062 addScreenNarrations (Lnet/minecraft/class_6382;)V
ARG 1 builder
METHOD method_37063 addDrawableChild (Lnet/minecraft/class_364;)Lnet/minecraft/class_364;
ARG 1 drawableElement
METHOD method_37064 narrateScreenIfNarrationEnabled (Z)V
ARG 1 useTranslationsCache
METHOD method_37065 narrateScreen (Z)V
ARG 1 useTranslationsCache
METHOD method_37066 remove (Lnet/minecraft/class_364;)V
ARG 1 child
METHOD method_37067 removeAllChildren ()V
METHOD method_37067 clearChildren ()V
METHOD method_37068 applyMouseMoveNarratorDelay ()V
METHOD method_37069 applyMousePressScrollNarratorDelay ()V
METHOD method_37070 applyKeyPressNarratorDelay ()V
METHOD method_37071 updateNarrator ()V
METHOD method_37072 applyNarratorModeChangeDelay ()V
METHOD method_37073 isNarratorActive ()Z
CLASS class_6390 SelectedElementNarrationData
FIELD field_33825 selectable Lnet/minecraft/class_6379;
FIELD field_33826 index I
FIELD field_33827 selectType Lnet/minecraft/class_6379$class_6380;
METHOD <init> (Lnet/minecraft/class_6379;ILnet/minecraft/class_6379$class_6380;)V
ARG 1 selectable
ARG 2 index
ARG 3 selectType

View File

@ -0,0 +1,23 @@
CLASS net/minecraft/class_6384 net/minecraft/client/gui/screen/narration/Narration
FIELD field_33793 EMPTY Lnet/minecraft/class_6384;
FIELD field_33794 value Ljava/lang/Object;
FIELD field_33795 transformer Ljava/util/function/BiConsumer;
METHOD <init> (Ljava/lang/Object;Ljava/util/function/BiConsumer;)V
ARG 1 value
ARG 2 transformer
METHOD equals (Ljava/lang/Object;)Z
ARG 1 o
METHOD method_37036 string (Ljava/lang/String;)Lnet/minecraft/class_6384;
ARG 0 string
METHOD method_37037 texts (Ljava/util/List;)Lnet/minecraft/class_6384;
ARG 0 texts
METHOD method_37038 (Ljava/util/List;Ljava/util/function/Consumer;Ljava/util/List;)V
ARG 1 consumer
ARG 2 texts
METHOD method_37039 forEachSentence (Ljava/util/function/Consumer;)V
ARG 1 consumer
METHOD method_37041 (Ljava/util/function/Consumer;Lnet/minecraft/class_2561;)V
ARG 0 consumer
ARG 1 text
METHOD method_37042 text (Lnet/minecraft/class_2561;)Lnet/minecraft/class_6384;
ARG 0 text

View File

@ -0,0 +1,14 @@
CLASS net/minecraft/class_6382 net/minecraft/client/gui/screen/narration/NarrationMessageBuilder
METHOD method_37031 nextMessage ()Lnet/minecraft/class_6382;
METHOD method_37032 put (Lnet/minecraft/class_6381;Lnet/minecraft/class_6384;)V
ARG 1 part
ARG 2 narration
METHOD method_37033 put (Lnet/minecraft/class_6381;Ljava/lang/String;)V
ARG 1 part
ARG 2 string
METHOD method_37034 put (Lnet/minecraft/class_6381;Lnet/minecraft/class_2561;)V
ARG 1 part
ARG 2 text
METHOD method_37035 put (Lnet/minecraft/class_6381;[Lnet/minecraft/class_2561;)V
ARG 1 part
ARG 2 texts

View File

@ -0,0 +1 @@
CLASS net/minecraft/class_6381 net/minecraft/client/gui/screen/narration/NarrationPart

View File

@ -0,0 +1,29 @@
CLASS net/minecraft/class_6385 net/minecraft/client/gui/screen/narration/ScreenNarrator
FIELD field_33796 currentMessageIndex I
FIELD field_33797 narrations Ljava/util/Map;
METHOD method_37044 buildNarrations (Ljava/util/function/Consumer;)V
ARG 1 builderConsumer
METHOD method_37045 buildNarratorText (Z)Ljava/lang/String;
ARG 1 forceTransform
METHOD method_37046 (ZLjava/util/function/Consumer;Lnet/minecraft/class_6385$class_6386;Lnet/minecraft/class_6385$class_6387;)V
ARG 3 partIndex
ARG 4 message
CLASS 1
FIELD field_33800 first Z
CLASS class_6386 PartIndex
FIELD field_33801 part Lnet/minecraft/class_6381;
FIELD field_33802 messageIndex I
METHOD <init> (Lnet/minecraft/class_6381;I)V
ARG 1 part
ARG 2 messageIndex
CLASS class_6387 Message
FIELD field_33803 narration Lnet/minecraft/class_6384;
FIELD field_33804 index I
FIELD field_33805 transformed Z
METHOD method_37049 setNarration (ILnet/minecraft/class_6384;)Lnet/minecraft/class_6385$class_6387;
ARG 1 index
ARG 2 narration
CLASS class_6388 MessageBuilder
FIELD field_33807 messageIndex I
METHOD <init> (Lnet/minecraft/class_6385;I)V
ARG 2 startIndex

View File

@ -13,5 +13,5 @@ CLASS net/minecraft/class_333 net/minecraft/client/util/NarratorManager
METHOD method_20602 getNarratorOption ()Lnet/minecraft/class_4065;
METHOD method_37015 narrate (Lnet/minecraft/class_2561;)V
ARG 1 text
METHOD method_37016 logNarrating (Ljava/lang/String;)V
ARG 1 text
METHOD method_37016 debugPrintMessage (Ljava/lang/String;)V
ARG 1 message