diff --git a/mappings/net/minecraft/SharedConstants.mapping b/mappings/net/minecraft/SharedConstants.mapping index f10648a42d..07a222a498 100644 --- a/mappings/net/minecraft/SharedConstants.mapping +++ b/mappings/net/minecraft/SharedConstants.mapping @@ -31,6 +31,16 @@ CLASS net/minecraft/class_155 net/minecraft/SharedConstants ARG 0 gameVersion METHOD method_36208 createGameVersion ()V METHOD method_43250 enableDataFixerOptimization ()V + METHOD method_44355 stripInvalidChars (Ljava/lang/String;Z)Ljava/lang/String; + COMMENT {@return {@code s} with {@linkplain #isValidChar invalid characters} stripped} + COMMENT + COMMENT

LF (linebreak; U+000A) may or may not be stripped depending on the passed + COMMENT {@code allowLinebreaks} value. + COMMENT + COMMENT @see #isValidChar + COMMENT @see #stripInvalidChars(String) + ARG 0 s + ARG 1 allowLinebreaks METHOD method_643 isValidChar (C)Z COMMENT {@return true if the character is not {@linkplain COMMENT net.minecraft.util.Formatting#FORMATTING_CODE_PREFIX the formatting code @@ -43,4 +53,11 @@ CLASS net/minecraft/class_155 net/minecraft/SharedConstants COMMENT @see net.minecraft.server.network.ServerPlayNetworkHandler#hasIllegalCharacter ARG 0 chr METHOD method_644 stripInvalidChars (Ljava/lang/String;)Ljava/lang/String; + COMMENT {@return {@code s} with all {@linkplain #isValidChar invalid characters} stripped} + COMMENT + COMMENT

LF (linebreak; U+000A) is an invalid character and therefore stripped. Use + COMMENT {@link #stripInvalidChars(String, boolean)} to keep linebreaks. + COMMENT + COMMENT @see #isValidChar + COMMENT @see #stripInvalidChars(String, boolean) ARG 0 s diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 0023eff299..91540b2de1 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -175,6 +175,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_39317 realms32BitWarningChecker Lnet/minecraft/class_7478; FIELD field_39420 authenticationService Lcom/mojang/authlib/yggdrasil/YggdrasilAuthenticationService; FIELD field_39421 servicesSignatureVerifier Lnet/minecraft/class_7500; + FIELD field_39492 abuseReporter Lnet/minecraft/class_7574; METHOD (Lnet/minecraft/class_542;)V ARG 1 args METHOD method_1476 checkIs64Bit ()Z @@ -487,6 +488,13 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient ARG 0 text METHOD method_44024 getRealms32BitWarningChecker ()Lnet/minecraft/class_7478; METHOD method_44256 getServicesSignatureVerifier ()Lnet/minecraft/class_7500; + METHOD method_44375 setCurrentServerEntry (Lnet/minecraft/class_4877;Ljava/lang/String;)V + ARG 1 server + ARG 2 address + METHOD method_44376 resetAbuseReporterIfNecessary (Lnet/minecraft/class_7569;)V + COMMENT Recreates and resets {@link #abuseReporter} if {@code environment} has changed. + ARG 1 environment + METHOD method_44377 getAbuseReporter ()Lnet/minecraft/class_7574; CLASS class_5859 ChatRestriction COMMENT Represents the restrictions on chat on a Minecraft client. COMMENT diff --git a/mappings/net/minecraft/client/font/TextRenderer.mapping b/mappings/net/minecraft/client/font/TextRenderer.mapping index 0067c9e885..a56a834369 100644 --- a/mappings/net/minecraft/client/font/TextRenderer.mapping +++ b/mappings/net/minecraft/client/font/TextRenderer.mapping @@ -41,6 +41,7 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer COMMENT COMMENT @return the height of the wrapped text COMMENT @see TextRenderer#wrapLines(StringVisitable, int) + COMMENT @see #getWrappedLinesHeight(StringVisitable, int) ARG 1 text ARG 2 maxWidth METHOD method_1714 trimToWidth (Lnet/minecraft/class_5348;I)Lnet/minecraft/class_5348; @@ -267,6 +268,12 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer ARG 7 index ARG 8 style ARG 9 codePoint + METHOD method_44378 getWrappedLinesHeight (Lnet/minecraft/class_5348;I)I + COMMENT {@return the height of the text, after it has been wrapped, in pixels} + COMMENT @see TextRenderer#wrapLines(StringVisitable, int) + COMMENT @see #getWrappedLinesHeight(String, int) + ARG 1 text + ARG 2 maxWidth CLASS class_5232 Drawer FIELD field_24239 vertexConsumers Lnet/minecraft/class_4597; FIELD field_24241 shadow Z diff --git a/mappings/net/minecraft/client/gui/DrawableHelper.mapping b/mappings/net/minecraft/client/gui/DrawableHelper.mapping index 4b94f1489e..a0145e0c8f 100644 --- a/mappings/net/minecraft/client/gui/DrawableHelper.mapping +++ b/mappings/net/minecraft/client/gui/DrawableHelper.mapping @@ -235,3 +235,9 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawableHelper ARG 3 x ARG 4 y ARG 5 color + METHOD method_44379 enableScissor (IIII)V + ARG 0 x1 + ARG 1 y1 + ARG 2 x2 + ARG 3 y2 + METHOD method_44380 disableScissor ()V diff --git a/mappings/net/minecraft/client/gui/EditBox.mapping b/mappings/net/minecraft/client/gui/EditBox.mapping new file mode 100644 index 0000000000..50d0081504 --- /dev/null +++ b/mappings/net/minecraft/client/gui/EditBox.mapping @@ -0,0 +1,169 @@ +CLASS net/minecraft/class_7530 net/minecraft/client/gui/EditBox + COMMENT A multiline edit box with support for basic keyboard shortcuts. + COMMENT This should not be used directly; {@link net.minecraft.client.gui.widget.EditBoxWidget} + COMMENT provides the GUI for the edit box. + FIELD field_39511 UNLIMITED_LENGTH I + COMMENT A constant denoting that the edit box accepts unlimited amount of text. Edit box + COMMENT widgets with such edit boxes do not show the current text length indicator. + FIELD field_39512 CURSOR_WIDTH I + FIELD field_39513 textRenderer Lnet/minecraft/class_327; + FIELD field_39514 lines Ljava/util/List; + FIELD field_39515 text Ljava/lang/String; + FIELD field_39516 cursor I + FIELD field_39517 selectionEnd I + FIELD field_39518 selecting Z + FIELD field_39519 maxLength I + FIELD field_39520 width I + FIELD field_39521 changeListener Ljava/util/function/Consumer; + FIELD field_39522 cursorChangeListener Ljava/lang/Runnable; + METHOD (Lnet/minecraft/class_327;I)V + ARG 1 textRenderer + ARG 2 width + METHOD method_44409 getMaxLength ()I + COMMENT {@return the maximum length of the edit box text in characters} + COMMENT + COMMENT

If this equals {@link #UNLIMITED_LENGTH}, the edit box does not have a + COMMENT length limit. Edit box widgets with such edit boxes do not show the current + COMMENT text length indicator. + COMMENT + COMMENT @see #setMaxLength + COMMENT @see #hasMaxLength + METHOD method_44410 moveCursor (DD)V + COMMENT Moves the cursor to the specified position relative to the edit box. + ARG 1 x + ARG 3 y + METHOD method_44411 setMaxLength (I)V + COMMENT Sets the maximum length of the edit box text in characters. + COMMENT + COMMENT

If {@code maxLength} equals {@link #UNLIMITED_LENGTH}, the edit box does not + COMMENT have a length limit. Edit box widgets with such edit boxes do not show the current + COMMENT text length indicator. + COMMENT + COMMENT @throws IllegalArgumentException if {@code maxLength} is negative + COMMENT @see #getMaxLength + COMMENT @see #hasMaxLength + ARG 1 maxLength + METHOD method_44412 moveCursor (Lnet/minecraft/class_7533;I)V + COMMENT Moves the cursor by {@code amount} characters. + COMMENT + COMMENT @apiNote See {@link CursorMovement} for the types of the movement. + ARG 1 movement + ARG 2 amount + METHOD method_44413 setCursorChangeListener (Ljava/lang/Runnable;)V + COMMENT Sets the cursor change listener that is called every time the cursor position changes. + ARG 1 cursorChangeListener + METHOD method_44414 setText (Ljava/lang/String;)V + COMMENT Sets the text of the edit box and moves the cursor to the end of the edit box. + ARG 1 text + METHOD method_44415 setChangeListener (Ljava/util/function/Consumer;)V + COMMENT Sets the change listener that is called every time the text changes. + ARG 1 changeListener + COMMENT the listener that takes the new text of the edit box + METHOD method_44416 (Lnet/minecraft/class_2583;II)V + ARG 1 style + ARG 2 start + ARG 3 end + METHOD method_44417 setSelecting (Z)V + COMMENT Sets whether the edit box is currently selecting. + COMMENT + COMMENT

If using the widget, this is done by dragging or holding down Shift and clicking. + ARG 1 selecting + METHOD method_44418 hasMaxLength ()Z + COMMENT {@return whether the edit box has a maximum length limit} + COMMENT + COMMENT

Edit box widgets with edit boxes without a length limit do not + COMMENT show the current text length indicator. + COMMENT + COMMENT @see #getMaxLength + COMMENT @see #setMaxLength + METHOD method_44419 delete (I)V + COMMENT Deletes the selected text, or {@code offset} characters of text from the cursor position + COMMENT if there is no selection. If the offset is negative, the characters before the cursor + COMMENT will be removed, and vice versa. + ARG 1 offset + METHOD method_44420 replaceSelection (Ljava/lang/String;)V + COMMENT Replaces the current selection with {@code string}. If there is no + COMMENT selection, this inserts the string at the cursor position. This removes + COMMENT {@linkplain SharedConstants#isValidChar invalid characters} and truncates + COMMENT the passed string if necessary. + ARG 1 string + METHOD method_44421 getText ()Ljava/lang/String; + COMMENT {@return the text of the edit box} + METHOD method_44422 getLine (I)Lnet/minecraft/class_7530$class_7531; + COMMENT {@return the line with index {@code index}} + ARG 1 index + METHOD method_44423 truncateForReplacement (Ljava/lang/String;)Ljava/lang/String; + COMMENT {@return {@code value} truncated to at most {@link #maxLength} characters} + COMMENT + COMMENT @see #truncate + ARG 1 value + METHOD method_44424 getCursor ()I + COMMENT {@return the cursor position} + METHOD method_44425 moveCursorLine (I)V + COMMENT Moves the cursor by {@code offset} lines. This method attempts to keep the + COMMENT relative position within the line the same. Does nothing if {@code offset} is zero. + ARG 1 offset + METHOD method_44426 truncate (Ljava/lang/String;)Ljava/lang/String; + COMMENT {@return {@code value} truncated to fit in the current text} + COMMENT

For example, if the edit box with 100 characters limit currently + COMMENT has 90 characters, this method will return at most 10 characters. + COMMENT + COMMENT @see #truncateForReplacement + ARG 1 value + METHOD method_44427 getSelection ()Lnet/minecraft/class_7530$class_7531; + COMMENT {@return the current selection} + METHOD method_44428 handleSpecialKey (I)Z + COMMENT Handles the special keys, such as copy, cut, linebreak, and cursor movements. + ARG 1 keyCode + METHOD method_44429 (Ljava/lang/String;)V + ARG 0 text + METHOD method_44430 getLineCount ()I + COMMENT {@return the number of total lines in the edit box} + METHOD method_44431 getOffsetLine (I)Lnet/minecraft/class_7530$class_7531; + COMMENT {@return the line offset by {@code offsetFromCurrent} from the cursor's line} + ARG 1 offsetFromCurrent + METHOD method_44432 getCurrentLineIndex ()I + COMMENT {@return the line index that the cursor is located at} + METHOD method_44433 getWordEndIndex (I)I + COMMENT {@return the end index of the word starting at {@code startIndex}} + COMMENT + COMMENT

A word is a string consisting entirely of non-whitespace characters. Therefore, + COMMENT the end index is the index of the character whose succeeding character is the first + COMMENT whitespace since {@code startIndex}. + ARG 1 startIndex + METHOD method_44434 getLines ()Ljava/lang/Iterable; + COMMENT {@return the lines of the edit box's text} + METHOD method_44435 hasSelection ()Z + COMMENT {@return whether the edit box has a selected text} + METHOD method_44436 getSelectedText ()Ljava/lang/String; + COMMENT {@return the text that is currently selected, or an empty string if there is no selection} + METHOD method_44437 getPreviousWordAtCursor ()Lnet/minecraft/class_7530$class_7531; + COMMENT {@return the substring of a word whose start position is before the cursor} + COMMENT + COMMENT

A word is a string consisting entirely of non-whitespace characters. If the + COMMENT cursor is in the middle of a word, the start position is that of the word; if not, + COMMENT the start position is that of the first word before the cursor. + COMMENT + COMMENT @see #getNextWordAtCursor + METHOD method_44438 getNextWordAtCursor ()Lnet/minecraft/class_7530$class_7531; + COMMENT {@return the substring of a word whose start position is after the cursor} + COMMENT + COMMENT

A word is a string consisting entirely of non-whitespace characters. If the + COMMENT cursor is in the middle of a word, the start position is that of the first word + COMMENT after the cursor; if not, the start position is that of the next word. + COMMENT + COMMENT @see #getPreviousWordAtCursor + METHOD method_44439 getCurrentLine ()Lnet/minecraft/class_7530$class_7531; + COMMENT {@return the line that the cursor is located at} + METHOD method_44440 onChange ()V + COMMENT Called when the text changes. This rewraps the text, calls + COMMENT {@link #changeListener}, then calls {@link #cursorChangeListener}. + METHOD method_44441 rewrap ()V + COMMENT Rewraps the text. This is called whenever the text changes. + CLASS class_7531 Substring + COMMENT A substring of an edit box's text, specified using the indices of the + COMMENT start and the end. This can indicate selections, lines, words, etc. This + COMMENT does not contain the string itself; to obtain the string, get the text + COMMENT first, then call {@link String#substring}. + FIELD field_39524 EMPTY Lnet/minecraft/class_7530$class_7531; + COMMENT An empty substring. diff --git a/mappings/net/minecraft/client/gui/PlayerSkinDrawer.mapping b/mappings/net/minecraft/client/gui/PlayerSkinDrawer.mapping new file mode 100644 index 0000000000..8c5e444b33 --- /dev/null +++ b/mappings/net/minecraft/client/gui/PlayerSkinDrawer.mapping @@ -0,0 +1,28 @@ +CLASS net/minecraft/class_7532 net/minecraft/client/gui/PlayerSkinDrawer + COMMENT Helper class for drawing a player's head on GUI. + METHOD method_44443 draw (Lnet/minecraft/class_4587;III)V + COMMENT Draws the player's head (including the hat) on GUI. The skin texture must be + COMMENT specified prior to calling by using {@link + COMMENT com.mojang.blaze3d.systems.RenderSystem#setShaderTexture(int, net.minecraft.util.Identifier)}. + ARG 0 matrices + ARG 1 x + ARG 2 y + ARG 3 size + METHOD method_44444 drawHat (Lnet/minecraft/class_4587;IIIZ)V + ARG 0 matrices + ARG 1 x + ARG 2 y + ARG 3 size + ARG 4 upsideDown + METHOD method_44445 draw (Lnet/minecraft/class_4587;IIIZZ)V + COMMENT Draws the player's head on GUI. The skin texture must be specified prior to + COMMENT calling by using {@link + COMMENT com.mojang.blaze3d.systems.RenderSystem#setShaderTexture(int, net.minecraft.util.Identifier)}. + ARG 0 matrices + ARG 1 x + ARG 2 y + ARG 3 size + ARG 4 hatVisible + COMMENT whether the hat should be drawn + ARG 5 upsideDown + COMMENT whether the head should be upside down, also known as "Dinnerbone" diff --git a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping index 83079dcf2f..a39cd153d9 100644 --- a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping @@ -160,18 +160,12 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud METHOD method_43591 onGameMessage (Lnet/minecraft/class_2556;Lnet/minecraft/class_2561;)V COMMENT Handles a game message. COMMENT - COMMENT @implNote This method discards the message if {@linkplain #extractSender the extracted - COMMENT sender} is blocked. Otherwise, it calls {@link ClientChatListener#onChatMessage}. - COMMENT COMMENT @see net.minecraft.client.network.ClientPlayNetworkHandler#onGameMessage ARG 1 type ARG 2 message METHOD method_43592 onChatMessage (Lnet/minecraft/class_2556;Lnet/minecraft/class_2561;Lnet/minecraft/class_7436;)V COMMENT Handles a chat message. COMMENT - COMMENT @implNote This method discards the message if the sender is blocked. - COMMENT Otherwise, it calls {@link ClientChatListener#onChatMessage}. - COMMENT COMMENT @see net.minecraft.client.network.ClientPlayNetworkHandler#onChatMessage ARG 1 type ARG 2 message diff --git a/mappings/net/minecraft/client/gui/screen/NoticeScreen.mapping b/mappings/net/minecraft/client/gui/screen/NoticeScreen.mapping index 98bc8c89df..813961eba9 100644 --- a/mappings/net/minecraft/client/gui/screen/NoticeScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/NoticeScreen.mapping @@ -3,6 +3,8 @@ CLASS net/minecraft/class_403 net/minecraft/client/gui/screen/NoticeScreen FIELD field_2346 notice Lnet/minecraft/class_2561; FIELD field_2348 noticeLines Lnet/minecraft/class_5489; FIELD field_2349 buttonText Lnet/minecraft/class_2561; + FIELD field_39539 NOTICE_TEXT_Y I + FIELD field_39540 shouldCloseOnEsc Z METHOD (Ljava/lang/Runnable;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V ARG 1 actionHandler ARG 2 title @@ -12,5 +14,6 @@ CLASS net/minecraft/class_403 net/minecraft/client/gui/screen/NoticeScreen ARG 2 title ARG 3 notice ARG 4 buttonText + ARG 5 shouldCloseOnEsc METHOD method_19790 (Lnet/minecraft/class_4185;)V ARG 1 button diff --git a/mappings/net/minecraft/client/gui/screen/RunningTaskScreen.mapping b/mappings/net/minecraft/client/gui/screen/RunningTaskScreen.mapping new file mode 100644 index 0000000000..3667d859fe --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/RunningTaskScreen.mapping @@ -0,0 +1,32 @@ +CLASS net/minecraft/class_7534 net/minecraft/client/gui/screen/RunningTaskScreen + COMMENT A screen that can be displayed while running a certain task. The task can be + COMMENT cancelled, and the display can be changed by calling {@code setDisplay} methods after the + COMMENT task succeeded or failed. + FIELD field_39541 TITLE_TEXT_Y I + FIELD field_39542 DESCRIPTION_TEXT_Y I + FIELD field_39543 DESCRIPTION_TEXT_WIDTH I + FIELD field_39544 cancelButtonText Lnet/minecraft/class_2561; + FIELD field_39545 buttonCallback Ljava/lang/Runnable; + FIELD field_39546 description Lnet/minecraft/class_5489; + FIELD field_39547 button Lnet/minecraft/class_4185; + FIELD field_39548 buttonActivationTime J + METHOD (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Ljava/lang/Runnable;)V + ARG 1 title + ARG 2 cancelButtonText + ARG 3 cancelCallback + METHOD method_44447 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_44448 replaceButton (Lnet/minecraft/class_2561;)V + ARG 1 buttonText + METHOD method_44449 setDisplay (Lnet/minecraft/class_2561;Ljava/lang/Runnable;)V + COMMENT Removes the description and changes the button text and callback to the provided one. + COMMENT The button will be deactivated for 1 second after calling this. + ARG 1 buttonText + ARG 2 buttonCallback + METHOD method_44450 setDisplay (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Ljava/lang/Runnable;)V + COMMENT Changes the description, the button text and callback to the provided one. + COMMENT The new description will be narrated, and the button will be deactivated for + COMMENT 1 second after calling this. + ARG 1 description + ARG 2 buttonText + ARG 3 buttonCallback diff --git a/mappings/net/minecraft/client/gui/screen/abusereport/AbuseReportReasonScreen.mapping b/mappings/net/minecraft/client/gui/screen/abusereport/AbuseReportReasonScreen.mapping new file mode 100644 index 0000000000..0b016f2d82 --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/abusereport/AbuseReportReasonScreen.mapping @@ -0,0 +1,24 @@ +CLASS net/minecraft/class_7551 net/minecraft/client/gui/screen/abusereport/AbuseReportReasonScreen + FIELD field_39612 TITLE_TEXT Lnet/minecraft/class_2561; + FIELD field_39613 DESCRIPTION_TEXT Lnet/minecraft/class_2561; + FIELD field_39614 REASON_LIST_BOTTOM_MARGIN I + FIELD field_39615 parent Lnet/minecraft/class_437; + FIELD field_39616 reasonList Lnet/minecraft/class_7551$class_7552; + FIELD field_39617 reason Lnet/minecraft/class_7573; + FIELD field_39618 reasonConsumer Ljava/util/function/Consumer; + METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_7573;Ljava/util/function/Consumer;)V + ARG 1 parent + ARG 2 reason + ARG 3 reasonConsumer + CLASS class_7552 ReasonListWidget + METHOD (Lnet/minecraft/class_7551;Lnet/minecraft/class_310;)V + ARG 2 client + METHOD method_44522 getEntry (Lnet/minecraft/class_7573;)Lnet/minecraft/class_7551$class_7552$class_7553; + ARG 1 reason + METHOD method_44523 (Lnet/minecraft/class_7573;Lnet/minecraft/class_7551$class_7552$class_7553;)Z + ARG 1 entry + CLASS class_7553 ReasonEntry + FIELD field_39621 reason Lnet/minecraft/class_7573; + METHOD (Lnet/minecraft/class_7551$class_7552;Lnet/minecraft/class_7573;)V + ARG 2 reason + METHOD method_44524 getReason ()Lnet/minecraft/class_7573; diff --git a/mappings/net/minecraft/client/gui/screen/abusereport/ChatReportScreen.mapping b/mappings/net/minecraft/client/gui/screen/abusereport/ChatReportScreen.mapping new file mode 100644 index 0000000000..5fce2a2cb1 --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/abusereport/ChatReportScreen.mapping @@ -0,0 +1,68 @@ +CLASS net/minecraft/class_7538 net/minecraft/client/gui/screen/abusereport/ChatReportScreen + FIELD field_39555 parent Lnet/minecraft/class_437; + FIELD field_39556 reporter Lnet/minecraft/class_7574; + FIELD field_39557 reasonDescription Lnet/minecraft/class_5489; + FIELD field_39558 editBox Lnet/minecraft/class_7529; + FIELD field_39559 sendButton Lnet/minecraft/class_4185; + FIELD field_39560 report Lnet/minecraft/class_7566; + FIELD field_39561 validationError Lnet/minecraft/class_7566$class_7567; + FIELD field_39562 BOTTOM_BUTTON_WIDTH I + FIELD field_39563 BUTTON_HEIGHT I + FIELD field_39564 BUTTON_TOP_MARGIN I + FIELD field_39565 BUTTON_BOTTOM_MARGIN I + FIELD field_39566 REASON_DESCRIPTION_TOP_MARGIN I + FIELD field_39567 REASON_DESCRIPTION_TEXT_WIDTH I + FIELD field_39568 SCREEN_HEIGHT I + FIELD field_39569 OBSERVED_WHAT_TEXT Lnet/minecraft/class_2561; + FIELD field_39570 SELECT_REASON_TEXT Lnet/minecraft/class_2561; + FIELD field_39571 MORE_COMMENTS_TEXT Lnet/minecraft/class_2561; + FIELD field_39572 DESCRIBE_TEXT Lnet/minecraft/class_2561; + FIELD field_39573 REPORT_SENT_MESSAGE_TEXT Lnet/minecraft/class_2561; + FIELD field_39574 SELECT_CHAT_TEXT Lnet/minecraft/class_2561; + FIELD field_39575 SENDING_TEXT Lnet/minecraft/class_2561; + FIELD field_39576 GENERIC_ERROR_TEXT Lnet/minecraft/class_2561; + METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_7574;Ljava/util/UUID;)V + ARG 1 parent + ARG 2 reporter + ARG 3 reportedPlayerUuid + METHOD method_44456 getTop ()I + METHOD method_44457 getBottom ()I + METHOD method_44458 getSelectionButtonY ()I + METHOD method_44459 getReasonButtonY ()I + METHOD method_44460 getEditBoxTop ()I + METHOD method_44461 getEditBoxBottom ()I + METHOD method_44462 getBottomButtonsY ()I + METHOD method_44465 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_44466 onSubmissionFinished (Lnet/minecraft/class_7534;)V + ARG 1 sendingScreen + METHOD method_44467 (Lnet/minecraft/class_7534;Ljava/lang/Object;Ljava/lang/Throwable;)Ljava/lang/Object; + ARG 2 unit + ARG 3 throwable + METHOD method_44468 onSubmissionError (Lnet/minecraft/class_7534;Ljava/lang/Throwable;)V + ARG 1 sendingScreen + ARG 2 throwable + METHOD method_44470 (Lnet/minecraft/class_7566$class_7568;)V + ARG 1 report + METHOD method_44471 (Lnet/minecraft/class_7566;)V + ARG 1 report + METHOD method_44472 (Lnet/minecraft/class_7573;)V + ARG 1 reason + METHOD method_44473 (Ljava/lang/String;)V + ARG 1 opinionComments + METHOD method_44475 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_44476 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_44477 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_44478 onChange ()V + METHOD method_44479 send ()V + METHOD method_44480 getWidgetsLeft ()I + METHOD method_44481 getWidgetsRight ()I + CLASS class_7539 DiscardWarningScreen + METHOD method_44482 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_44483 (Lnet/minecraft/class_4185;)V + ARG 1 button + CLASS class_7540 ValidationErrorTooltipSupplier diff --git a/mappings/net/minecraft/client/gui/screen/abusereport/ChatSelectionScreen.mapping b/mappings/net/minecraft/client/gui/screen/abusereport/ChatSelectionScreen.mapping new file mode 100644 index 0000000000..78aa91a1c2 --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/abusereport/ChatSelectionScreen.mapping @@ -0,0 +1,78 @@ +CLASS net/minecraft/class_7543 net/minecraft/client/gui/screen/abusereport/ChatSelectionScreen + FIELD field_39584 parent Lnet/minecraft/class_437; + FIELD field_39585 reporter Lnet/minecraft/class_7574; + FIELD field_39586 doneButton Lnet/minecraft/class_4185; + FIELD field_39587 selectionList Lnet/minecraft/class_7543$class_7544; + FIELD field_39588 report Lnet/minecraft/class_7566; + FIELD field_39589 newReportConsumer Ljava/util/function/Consumer; + FIELD field_39590 listAdder Lnet/minecraft/class_7541; + FIELD field_39591 tooltip Ljava/util/List; + METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_7574;Lnet/minecraft/class_7566;Ljava/util/function/Consumer;)V + ARG 1 parent + ARG 2 reporter + ARG 3 report + ARG 4 newReportConsumer + METHOD method_44493 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_44495 isSentByReportedPlayer (Lnet/minecraft/class_7557;)Z + ARG 1 message + METHOD method_44496 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_44498 setTooltip (Ljava/util/List;)V + ARG 1 tooltip + METHOD method_44504 addMessages ()V + METHOD method_44507 addMoreMessages ()V + METHOD method_44509 setDoneButtonActivation ()V + CLASS class_7544 SelectionListWidget + FIELD field_39593 lastSenderEntryPair Lnet/minecraft/class_7543$class_7544$class_7547; + METHOD (Lnet/minecraft/class_7543;Lnet/minecraft/class_310;)V + ARG 2 client + METHOD method_44511 addSenderEntry (Lnet/minecraft/class_7557$class_7558;Z)V + ARG 1 message + ARG 2 fromReportedPlayer + METHOD method_44512 tryMoveSelection (Lnet/minecraft/class_350$class_5403;)Z + ARG 1 direction + METHOD method_44513 getDisplayedItemCount ()I + CLASS class_7545 TextEntry + FIELD field_39595 TEXT_COLOR I + FIELD field_39596 text Lnet/minecraft/class_2561; + METHOD (Lnet/minecraft/class_7543$class_7544;Lnet/minecraft/class_2561;)V + ARG 2 text + CLASS class_7546 Entry + METHOD method_44514 isSelected ()Z + METHOD method_44515 canSelect ()Z + CLASS class_7547 SenderEntryPair + METHOD method_44516 senderEquals (Lnet/minecraft/class_7543$class_7544$class_7547;)Z + ARG 1 pair + CLASS class_7548 MessageEntry + FIELD field_39599 CHAT_MESSAGE_LEFT_MARGIN I + FIELD field_39600 index I + FIELD field_39601 truncatedContent Lnet/minecraft/class_5348; + FIELD field_39602 narration Lnet/minecraft/class_2561; + FIELD field_39603 fullContent Ljava/util/List; + FIELD field_39604 fromReportedPlayer Z + FIELD field_39605 isChatMessage Z + METHOD (Lnet/minecraft/class_7543$class_7544;ILnet/minecraft/class_2561;Lnet/minecraft/class_2561;ZZ)V + ARG 2 index + ARG 3 content + ARG 4 narration + ARG 5 fromReportedPlayer + ARG 6 isChatMessage + METHOD method_44517 toggle ()Z + CLASS class_7549 SenderEntry + FIELD field_39607 PLAYER_SKIN_SIZE I + FIELD field_39608 headingText Lnet/minecraft/class_2561; + FIELD field_39609 skinTextureId Lnet/minecraft/class_2960; + FIELD field_39610 fromReportedPlayer Z + METHOD (Lnet/minecraft/class_7543$class_7544;Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_2561;Z)V + ARG 2 gameProfile + ARG 3 headingText + ARG 4 fromReportedPlayer + METHOD method_44518 getSkinTextureId (Lcom/mojang/authlib/GameProfile;)Lnet/minecraft/class_2960; + ARG 1 gameProfile + METHOD method_44519 drawSkin (Lnet/minecraft/class_4587;IILnet/minecraft/class_2960;)V + ARG 1 matrices + ARG 2 x + ARG 3 y + ARG 4 skinTextureId + CLASS class_7550 SeparatorEntry diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping index 59ac947c8b..c979807699 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping @@ -22,7 +22,11 @@ CLASS net/minecraft/class_5519 net/minecraft/client/gui/screen/multiplayer/Socia FIELD field_26909 BLOCKED_OFFLINE_TEXT Lnet/minecraft/class_2561; FIELD field_33837 hideText Lnet/minecraft/class_2561; FIELD field_33838 showText Lnet/minecraft/class_2561; + FIELD field_39622 reportButton Lnet/minecraft/class_4185; + FIELD field_39623 reportText Lnet/minecraft/class_2561; + FIELD field_39624 reportTooltip Ljava/util/List; METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_5522;Ljava/util/UUID;Ljava/lang/String;Ljava/util/function/Supplier;)V + ARG 1 client ARG 2 parent ARG 3 uuid ARG 4 name @@ -47,3 +51,5 @@ CLASS net/minecraft/class_5519 net/minecraft/client/gui/screen/multiplayer/Socia METHOD method_31389 getNarrationMessage (Lnet/minecraft/class_5250;)Lnet/minecraft/class_5250; ARG 1 text METHOD method_31390 getStatusText ()Lnet/minecraft/class_2561; + METHOD method_44525 (Lnet/minecraft/class_310;Lnet/minecraft/class_7574;Ljava/util/UUID;Lnet/minecraft/class_4185;)V + ARG 3 button diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen.mapping index f9a0317529..7387822ad8 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen.mapping @@ -40,8 +40,15 @@ CLASS net/minecraft/class_5522 net/minecraft/client/gui/screen/multiplayer/Socia ARG 1 button METHOD method_31357 onSearchChange (Ljava/lang/String;)V ARG 1 currentSearch + METHOD method_31359 getScreenHeight ()I + METHOD method_31360 getRowCount ()I + METHOD method_31361 getPlayerListBottom ()I + METHOD method_31362 getSearchBoxX ()I METHOD method_31394 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_31396 (Lnet/minecraft/class_4185;)V ARG 1 button + METHOD method_31398 (Z)V + ARG 1 confirmed + METHOD method_44528 createAbuseReportNoticeScreen ()Lnet/minecraft/class_437; CLASS class_5523 Tab diff --git a/mappings/net/minecraft/client/gui/widget/EditBoxWidget.mapping b/mappings/net/minecraft/client/gui/widget/EditBoxWidget.mapping new file mode 100644 index 0000000000..16dadeda22 --- /dev/null +++ b/mappings/net/minecraft/client/gui/widget/EditBoxWidget.mapping @@ -0,0 +1,54 @@ +CLASS net/minecraft/class_7529 net/minecraft/client/gui/widget/EditBoxWidget + COMMENT A widget of {@link EditBox}, a multiline edit box with support for + COMMENT basic keyboard shortcuts. This class implements the rendering and scrolling + COMMENT for the edit box. + FIELD field_39502 CURSOR_PADDING I + FIELD field_39503 CURSOR_COLOR I + FIELD field_39504 UNDERSCORE Ljava/lang/String; + FIELD field_39505 FOCUSED_BOX_TEXT_COLOR I + FIELD field_39506 UNFOCUSED_BOX_TEXT_COLOR I + FIELD field_39507 textRenderer Lnet/minecraft/class_327; + FIELD field_39508 placeholder Lnet/minecraft/class_2561; + COMMENT The placehodler text that gets rendered when the edit box is empty. This does not + COMMENT get returned from {@link #getText}; an empty string will be returned in such cases. + FIELD field_39509 editBox Lnet/minecraft/class_7530; + FIELD field_39510 tick I + METHOD (Lnet/minecraft/class_327;IIIILnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V + ARG 1 textRenderer + ARG 2 x + ARG 3 y + ARG 4 width + ARG 5 height + ARG 6 placeholder + ARG 7 message + METHOD method_44400 setText (Ljava/lang/String;)V + COMMENT Sets the text of the edit box and moves the cursor to the end of the edit box. + ARG 1 text + METHOD method_44401 setChangeListener (Ljava/util/function/Consumer;)V + COMMENT Sets the change listener that is called every time the text changes. + ARG 1 changeListener + COMMENT the listener that takes the new text of the edit box + METHOD method_44402 setMaxLength (I)V + COMMENT Sets the maximum length of the edit box text in characters. + COMMENT + COMMENT

If {@code maxLength} equals {@link EditBox#UNLIMITED_LENGTH}, the edit box does not + COMMENT have a length limit, and the widget does not show the current text length indicator. + COMMENT + COMMENT @throws IllegalArgumentException if {@code maxLength} is negative + COMMENT @see EditBox#setMaxLength + ARG 1 maxLength + METHOD method_44403 drawSelection (Lnet/minecraft/class_4587;IIII)V + ARG 1 matrices + ARG 2 left + ARG 3 top + ARG 4 right + ARG 5 bottom + METHOD method_44404 moveCursor (DD)V + ARG 1 mouseX + ARG 3 mouseY + METHOD method_44405 getText ()Ljava/lang/String; + COMMENT {@return the current text of the edit box} + METHOD method_44406 tick ()V + METHOD method_44407 onCursorChange ()V + METHOD method_44408 getMaxLinesWithoutOverflow ()D + COMMENT {@return the maximum amount of lines the widget can hold without overflowing} diff --git a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping index d28dd6ebbc..1e761c624e 100644 --- a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping @@ -37,8 +37,9 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget ARG 2 y METHOD method_25311 renderList (Lnet/minecraft/class_4587;IIF)V ARG 1 matrices - ARG 2 x - ARG 3 y + ARG 2 mouseX + ARG 3 mouseY + ARG 4 delta METHOD method_25312 renderHeader (Lnet/minecraft/class_4587;IILnet/minecraft/class_289;)V ARG 1 matrices ARG 2 x @@ -105,6 +106,8 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget ARG 1 entry METHOD method_30013 moveSelectionIf (Lnet/minecraft/class_350$class_5403;Ljava/util/function/Predicate;)Z COMMENT Moves the selection in the specified direction until the predicate returns true. + COMMENT + COMMENT @return whether the selection matching the predicate was found ARG 1 direction COMMENT the direction to move the selection ARG 2 predicate @@ -120,6 +123,25 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget ARG 1 builder ARG 2 entry METHOD method_37019 getHoveredEntry ()Lnet/minecraft/class_350$class_351; + METHOD method_44397 renderEntry (Lnet/minecraft/class_4587;IIFIIIII)V + ARG 1 matrices + ARG 2 mouseX + ARG 3 mouseY + ARG 4 delta + ARG 5 index + ARG 6 x + ARG 7 y + ARG 8 entryWidth + ARG 9 entryHeight + METHOD method_44398 drawSelectionHighlight (Lnet/minecraft/class_4587;IIIII)V + ARG 1 matrices + ARG 2 y + ARG 3 entryWidth + ARG 4 entryHeight + ARG 5 borderColor + ARG 6 fillColor + METHOD method_44399 addEntryToTop (Lnet/minecraft/class_350$class_351;)V + ARG 1 entry CLASS class_351 Entry FIELD field_22752 parentList Lnet/minecraft/class_350; METHOD method_25343 render (Lnet/minecraft/class_4587;IIIIIIIZF)V diff --git a/mappings/net/minecraft/client/gui/widget/ScrollableWidget.mapping b/mappings/net/minecraft/client/gui/widget/ScrollableWidget.mapping new file mode 100644 index 0000000000..39a3256daa --- /dev/null +++ b/mappings/net/minecraft/client/gui/widget/ScrollableWidget.mapping @@ -0,0 +1,46 @@ +CLASS net/minecraft/class_7528 net/minecraft/client/gui/widget/ScrollableWidget + COMMENT A widget that can be focused and vertically scrolled. + FIELD field_39493 FOCUSED_BORDER_COLOR I + FIELD field_39494 UNFOCUSED_BORDER_COLOR I + FIELD field_39495 BOX_COLOR I + FIELD field_39496 PADDING I + FIELD field_39497 scrollY D + FIELD field_39498 scrollbarDragged Z + METHOD method_44381 getPadding ()I + METHOD method_44382 setScrollY (D)V + ARG 1 scrollY + METHOD method_44383 isVisible (II)Z + ARG 1 top + ARG 2 bottom + METHOD method_44384 renderOverlay (Lnet/minecraft/class_4587;)V + COMMENT Renders overlays that are not scrolled but part of the widget. + COMMENT + COMMENT

This renders the scrollbar by default. Subclasses can override this to + COMMENT render other overlays, but {@code super} call is necessary to make sure the scrollbar + COMMENT renders when it should. + ARG 1 matrices + METHOD method_44385 getPaddingDoubled ()I + METHOD method_44386 drawBox (Lnet/minecraft/class_4587;)V + COMMENT Draws the box that the contents are rendered over, including its borders. + ARG 1 matrices + METHOD method_44387 getScrollY ()D + METHOD method_44388 isWithinBounds (DD)Z + ARG 1 mouseX + ARG 3 mouseY + METHOD method_44389 renderContents (Lnet/minecraft/class_4587;IIF)V + COMMENT Renders the scrolled contents. Subclasses must override this. The rendered contents + COMMENT may overflow; the caller should trim those using {@link + COMMENT net.minecraft.client.gui.DrawableHelper#enableScissor}. + ARG 1 matrices + ARG 2 mouseX + ARG 3 mouseY + ARG 4 delta + METHOD method_44390 getMaxScrollY ()I + METHOD method_44391 getContentsHeight ()I + COMMENT {@return the total height of the contents} + METHOD method_44392 overflows ()Z + COMMENT {@return whether the contents overflow and needs a scrollbar} + METHOD method_44393 getDeltaYPerScroll ()D + METHOD method_44394 getScrollbarThumbHeight ()I + METHOD method_44395 getContentsHeightWithPadding ()I + METHOD method_44396 drawScrollbar ()V diff --git a/mappings/net/minecraft/client/input/CursorMovement.mapping b/mappings/net/minecraft/client/input/CursorMovement.mapping new file mode 100644 index 0000000000..5ac6f69314 --- /dev/null +++ b/mappings/net/minecraft/client/input/CursorMovement.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_7533 net/minecraft/client/input/CursorMovement + COMMENT The types of cursor movement. + FIELD field_39535 Lnet/minecraft/class_7533; + COMMENT Cursor is moved using an absolute position. + FIELD field_39536 Lnet/minecraft/class_7533; + COMMENT Cursor is moved using a relative position. + FIELD field_39537 Lnet/minecraft/class_7533; + COMMENT Cursor is moved to the end of the text. diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping index 58ee9225ea..a19da64be1 100644 --- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping @@ -126,3 +126,13 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand ARG 1 type ARG 2 message ARG 3 sender + METHOD method_44529 getProfile (Lnet/minecraft/class_7436;)Lcom/mojang/authlib/GameProfile; + COMMENT {@return the game profile of {@code sender}} + COMMENT + COMMENT

If {@code sender} points to a non-player (such as entities sending + COMMENT chat messages through {@code /say} command) or a player not in the game, + COMMENT this will create a new game profile based on the UUID and the display + COMMENT name. + ARG 1 sender + METHOD method_44530 extractSender (Lnet/minecraft/class_2561;)Ljava/util/UUID; + ARG 1 content diff --git a/mappings/net/minecraft/client/network/abusereport/AbuseReportReason.mapping b/mappings/net/minecraft/client/network/abusereport/AbuseReportReason.mapping new file mode 100644 index 0000000000..baabcc88b1 --- /dev/null +++ b/mappings/net/minecraft/client/network/abusereport/AbuseReportReason.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_7573 net/minecraft/client/network/abusereport/AbuseReportReason + FIELD field_39671 id Ljava/lang/String; + FIELD field_39672 text Lnet/minecraft/class_2561; + FIELD field_39673 description Lnet/minecraft/class_2561; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 id + METHOD method_44594 getId ()Ljava/lang/String; + METHOD method_44595 getText ()Lnet/minecraft/class_2561; + METHOD method_44596 getDescription ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/client/network/abusereport/AbuseReportSender.mapping b/mappings/net/minecraft/client/network/abusereport/AbuseReportSender.mapping new file mode 100644 index 0000000000..bc68a97ae6 --- /dev/null +++ b/mappings/net/minecraft/client/network/abusereport/AbuseReportSender.mapping @@ -0,0 +1,18 @@ +CLASS net/minecraft/class_7563 net/minecraft/client/network/abusereport/AbuseReportSender + METHOD method_44561 canSendReports ()Z + METHOD method_44562 create (Lnet/minecraft/class_7569;Lcom/mojang/authlib/minecraft/UserApiService;)Lnet/minecraft/class_7563; + ARG 0 environment + ARG 1 userApiService + METHOD method_44563 send (Ljava/util/UUID;Lcom/mojang/authlib/minecraft/report/AbuseReport;)Ljava/util/concurrent/CompletableFuture; + ARG 1 id + ARG 2 report + METHOD method_44564 getLimits ()Lcom/mojang/authlib/minecraft/report/AbuseReportLimits; + CLASS class_7564 AbuseReportException + CLASS class_7565 Impl + FIELD field_39642 SERVICE_UNAVAILABLE_ERROR_TEXT Lnet/minecraft/class_2561; + FIELD field_39643 HTTP_ERROR_TEXT Lnet/minecraft/class_2561; + FIELD field_39644 JSON_ERROR_TEXT Lnet/minecraft/class_2561; + METHOD method_44565 getErrorText (Lcom/mojang/authlib/exceptions/MinecraftClientException;)Lnet/minecraft/class_2561; + ARG 1 exception + METHOD method_44566 getErrorText (Lcom/mojang/authlib/exceptions/MinecraftClientHttpException;)Lnet/minecraft/class_2561; + ARG 1 exception diff --git a/mappings/net/minecraft/client/network/abusereport/AbuseReporter.mapping b/mappings/net/minecraft/client/network/abusereport/AbuseReporter.mapping new file mode 100644 index 0000000000..8fb27f8ee4 --- /dev/null +++ b/mappings/net/minecraft/client/network/abusereport/AbuseReporter.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_7574 net/minecraft/client/network/abusereport/AbuseReporter + FIELD field_39675 MAX_LOGS I + METHOD method_44598 environmentEquals (Lnet/minecraft/class_7569;)Z + ARG 1 environment + METHOD method_44599 create (Lnet/minecraft/class_7569;Lcom/mojang/authlib/minecraft/UserApiService;)Lnet/minecraft/class_7574; + ARG 0 environment + ARG 1 userApiService diff --git a/mappings/net/minecraft/client/network/abusereport/ChatAbuseReport.mapping b/mappings/net/minecraft/client/network/abusereport/ChatAbuseReport.mapping new file mode 100644 index 0000000000..cd3b0e1f96 --- /dev/null +++ b/mappings/net/minecraft/client/network/abusereport/ChatAbuseReport.mapping @@ -0,0 +1,57 @@ +CLASS net/minecraft/class_7566 net/minecraft/client/network/abusereport/ChatAbuseReport + FIELD field_39645 CHAT Ljava/lang/String; + FIELD field_39646 EVIDENTIAL_SUCCEEDING_MESSAGES I + FIELD field_39647 EVIDENTIAL_PRECEDING_MESSAGES I + FIELD field_39648 id Ljava/util/UUID; + FIELD field_39649 timestamp Ljava/time/Instant; + FIELD field_39650 reportedPlayerUuid Ljava/util/UUID; + FIELD field_39651 limits Lcom/mojang/authlib/minecraft/report/AbuseReportLimits; + FIELD field_39652 selections Lit/unimi/dsi/fastutil/ints/IntSet; + FIELD field_39653 opinionComments Ljava/lang/String; + FIELD field_39654 reason Lnet/minecraft/class_7573; + METHOD (Ljava/util/UUID;Lcom/mojang/authlib/minecraft/report/AbuseReportLimits;)V + ARG 1 reportedPlayerUuid + ARG 2 limits + METHOD (Ljava/util/UUID;Ljava/time/Instant;Ljava/util/UUID;Lcom/mojang/authlib/minecraft/report/AbuseReportLimits;)V + ARG 1 id + ARG 2 timestamp + ARG 3 reportedPlayerUuid + ARG 4 limits + METHOD method_44568 getReportedPlayerUuid ()Ljava/util/UUID; + METHOD method_44569 toggleMessageSelection (I)V + ARG 1 index + METHOD method_44570 toReportChatMessage (ILnet/minecraft/class_7557$class_7558;)Lcom/mojang/authlib/minecraft/report/ReportChatMessage; + ARG 1 index + ARG 2 message + METHOD method_44571 collectEvidence (Lnet/minecraft/class_7555;)Lcom/mojang/authlib/minecraft/report/ReportEvidence; + ARG 1 log + METHOD method_44572 streamNeighboringIndices (Lnet/minecraft/class_7555;I)Ljava/util/stream/IntStream; + ARG 1 log + ARG 2 index + METHOD method_44573 (Lnet/minecraft/class_7555;Lit/unimi/dsi/fastutil/ints/IntSortedSet;I)V + ARG 1 selectedIndex + METHOD method_44574 setReason (Lnet/minecraft/class_7573;)V + ARG 1 reason + METHOD method_44575 finalizeReport (Lnet/minecraft/class_7574;)Lcom/mojang/datafixers/util/Either; + ARG 1 reporter + METHOD method_44576 setOpinionComments (Ljava/lang/String;)V + ARG 1 opinionComments + METHOD method_44577 serializeContent (Lnet/minecraft/class_2561;)Ljava/lang/String; + ARG 0 content + METHOD method_44578 base64Encode ([B)Ljava/lang/String; + ARG 0 bs + METHOD method_44579 getSelections ()Lit/unimi/dsi/fastutil/ints/IntSet; + METHOD method_44580 hasSelectedMessage (I)Z + ARG 1 index + METHOD method_44581 (Lnet/minecraft/class_7555;I)Lcom/mojang/authlib/minecraft/report/ReportChatMessage; + ARG 2 index + METHOD method_44582 getOpinionComments ()Ljava/lang/String; + METHOD method_44583 getReason ()Lnet/minecraft/class_7573; + METHOD method_44584 validate ()Lnet/minecraft/class_7566$class_7567; + METHOD method_44585 copy ()Lnet/minecraft/class_7566; + CLASS class_7567 ValidationError + FIELD field_39655 NO_REASON Lnet/minecraft/class_7566$class_7567; + FIELD field_39656 NO_REPORTED_MESSAGES Lnet/minecraft/class_7566$class_7567; + FIELD field_39657 TOO_MANY_MESSAGES Lnet/minecraft/class_7566$class_7567; + FIELD field_39658 COMMENTS_TOO_LONG Lnet/minecraft/class_7566$class_7567; + CLASS class_7568 ReportWithId diff --git a/mappings/net/minecraft/client/network/abusereport/GroupedMessagesCollector.mapping b/mappings/net/minecraft/client/network/abusereport/GroupedMessagesCollector.mapping new file mode 100644 index 0000000000..7ded484410 --- /dev/null +++ b/mappings/net/minecraft/client/network/abusereport/GroupedMessagesCollector.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/class_7535 net/minecraft/client/network/abusereport/GroupedMessagesCollector + FIELD field_39549 reportTypeGetter Ljava/util/function/Function; + FIELD field_39550 messages Ljava/util/List; + FIELD field_39551 reportType Lnet/minecraft/class_7535$class_7536; + METHOD (Ljava/util/function/Function;)V + ARG 1 reportTypeGetter + METHOD method_44452 collect ()Lnet/minecraft/class_7535$class_7537; + METHOD method_44453 add (Lnet/minecraft/class_7557$class_7560;)Z + ARG 1 message + CLASS class_7536 ReportType + METHOD method_44454 isContext ()Z + CLASS class_7537 GroupedMessages diff --git a/mappings/net/minecraft/client/network/abusereport/MessagesListAdder.mapping b/mappings/net/minecraft/client/network/abusereport/MessagesListAdder.mapping new file mode 100644 index 0000000000..800841015b --- /dev/null +++ b/mappings/net/minecraft/client/network/abusereport/MessagesListAdder.mapping @@ -0,0 +1,30 @@ +CLASS net/minecraft/class_7541 net/minecraft/client/network/abusereport/MessagesListAdder + FIELD field_39580 MAX_CONTIGUOUS_CONTEXT_MESSAGES I + FIELD field_39581 log Lnet/minecraft/class_7555; + FIELD field_39582 reportablePredicate Ljava/util/function/Predicate; + FIELD field_39583 logMaxIndex I + METHOD (Lnet/minecraft/class_7555;Ljava/util/function/Predicate;)V + ARG 1 log + ARG 2 reportablePredicate + METHOD method_44484 collectGroupedMessages ()Lnet/minecraft/class_7535$class_7537; + METHOD method_44485 (II)I + ARG 0 acc + ARG 1 cur + METHOD method_44486 add (ILnet/minecraft/class_7541$class_7542;)V + ARG 1 minAmount + ARG 2 messagesList + METHOD method_44487 (Lnet/minecraft/class_7557$class_7560;)Lnet/minecraft/class_7535$class_7536; + ARG 1 message + METHOD method_44488 getReportType (Lnet/minecraft/class_7557;)Lnet/minecraft/class_7535$class_7536; + ARG 1 message + METHOD method_44489 addContextMessages (Ljava/util/List;Lnet/minecraft/class_7541$class_7542;)I + ARG 0 messages + ARG 1 messagesList + CLASS class_7542 MessagesList + METHOD method_44490 addMessage (ILnet/minecraft/class_7557;)V + ARG 1 index + ARG 2 message + METHOD method_44491 addMessages (Ljava/lang/Iterable;)V + ARG 1 messages + METHOD method_44492 addText (Lnet/minecraft/class_2561;)V + ARG 1 text diff --git a/mappings/net/minecraft/client/network/abusereport/ReporterEnvironment.mapping b/mappings/net/minecraft/client/network/abusereport/ReporterEnvironment.mapping new file mode 100644 index 0000000000..7a54f5afa5 --- /dev/null +++ b/mappings/net/minecraft/client/network/abusereport/ReporterEnvironment.mapping @@ -0,0 +1,17 @@ +CLASS net/minecraft/class_7569 net/minecraft/client/network/abusereport/ReporterEnvironment + METHOD method_44586 ofIntegratedServer ()Lnet/minecraft/class_7569; + METHOD method_44587 ofRealm (Lnet/minecraft/class_4877;)Lnet/minecraft/class_7569; + ARG 0 server + METHOD method_44588 ofServer (Lnet/minecraft/class_7569$class_7570;)Lnet/minecraft/class_7569; + ARG 0 server + METHOD method_44589 ofThirdPartyServer (Ljava/lang/String;)Lnet/minecraft/class_7569; + ARG 0 ip + METHOD method_44590 toClientInfo ()Lcom/mojang/authlib/yggdrasil/request/AbuseReportRequest$ClientInfo; + METHOD method_44591 toThirdPartyServerInfo ()Lcom/mojang/authlib/yggdrasil/request/AbuseReportRequest$ThirdPartyServerInfo; + METHOD method_44592 toRealmInfo ()Lcom/mojang/authlib/yggdrasil/request/AbuseReportRequest$RealmInfo; + METHOD method_44593 getVersion ()Ljava/lang/String; + CLASS class_7570 Server + CLASS class_7571 Realm + METHOD (Lnet/minecraft/class_4877;)V + ARG 1 server + CLASS class_7572 ThirdParty diff --git a/mappings/net/minecraft/client/network/chat/ChatLog.mapping b/mappings/net/minecraft/client/network/chat/ChatLog.mapping new file mode 100644 index 0000000000..2469b343dc --- /dev/null +++ b/mappings/net/minecraft/client/network/chat/ChatLog.mapping @@ -0,0 +1,111 @@ +CLASS net/minecraft/class_7555 net/minecraft/client/network/chat/ChatLog + COMMENT A chat log holds received chat and game messages with sequential indices, where + COMMENT newer messages receive bigger indices. An implementation using fixed-size array + COMMENT is available at {@link ChatLogImpl}. + FIELD field_39629 MISSING_NEXT_INDEX I + METHOD method_44531 getMaxIndex ()I + COMMENT {@return the maximum index currently used within the log} + COMMENT + COMMENT

This value changes every time a new message gets added. The message + COMMENT associated with this index is the newest one in the log. + METHOD method_44532 get (I)Lnet/minecraft/class_7557; + COMMENT {@return the message with index {@code index}, or {@code null} if there is no + COMMENT such message in the log} + ARG 1 index + METHOD method_44533 getOffsetIndex (II)I + COMMENT {@return the index offset by {@code offset} if there is a message with that index, or + COMMENT {@value #MISSING_NEXT_INDEX} if there is no message with the offset index} + ARG 1 index + ARG 2 offset + METHOD method_44534 stream (ILjava/util/function/IntUnaryOperator;)Lnet/minecraft/class_7555$class_7556; + COMMENT {@return the streams starting from {@code startIndex}} + COMMENT + COMMENT @implNote If {@code startIndex} is not in the log, this returns {@link #emptyStreams}. + ARG 1 startIndex + ARG 2 nextIndexGetter + COMMENT a function that, when given an index, returns the next index + COMMENT or {@value #MISSING_NEXT_INDEX} to indicate the end of the stream + METHOD method_44535 add (Lnet/minecraft/class_7557;)V + COMMENT Adds {@code message} to the log. + ARG 1 message + METHOD method_44536 getMinIndex ()I + COMMENT {@return the minimum index currently used within the log} + COMMENT + COMMENT

This value can change every time a new message gets added. The message + COMMENT associated with this index is the oldest one in the log. + METHOD method_44537 getIndexed (I)Lnet/minecraft/class_7557$class_7560; + COMMENT {@return the indexed message with index {@code index}, or {@code null} if there is no + COMMENT such message in the log} + ARG 1 index + METHOD method_44538 clampWithOffset (II)I + COMMENT {@return the index offset by {@code offset} and clamped between the minimum + COMMENT and the maximum indices} + COMMENT + COMMENT @see #getMaxIndex + COMMENT @see #getMinIndex + ARG 1 index + ARG 2 offset + METHOD method_44539 streamForward ()Lnet/minecraft/class_7555$class_7556; + COMMENT {@return the streams starting from {@linkplain #getMinIndex the smallest index + COMMENT in the log} with entires ordered chronologically (in ascending order)} + METHOD method_44540 contains (I)Z + COMMENT {@return whether the log contains a message with index {@code index}} + ARG 1 index + METHOD method_44541 streamForward (II)Lnet/minecraft/class_7555$class_7556; + COMMENT {@return the streams starting from {@code startIndex} with entires ordered + COMMENT chronologically (in ascending order) up to and including {@code endIndex}} + COMMENT + COMMENT @implNote If either {@code startIndex} or {@code endIndex} is not in the log, + COMMENT this returns {@link #emptyStreams}. + ARG 1 startIndex + ARG 2 endIndex + METHOD method_44542 emptyStreams ()Lnet/minecraft/class_7555$class_7556; + COMMENT {@return the empty stream} + METHOD method_44543 getPreviousIndex (I)I + COMMENT {@return the index offset by {@code -1} if there is a message with that index, or + COMMENT {@value #MISSING_NEXT_INDEX} if there is no message with the offset index} + COMMENT + COMMENT @see #getOffsetIndex + ARG 1 index + METHOD method_44544 (II)I + ARG 2 currentIndex + METHOD method_44545 getNextIndex (I)I + COMMENT {@return the index offset by {@code 1} if there is a message with that index, or + COMMENT {@value #MISSING_NEXT_INDEX} if there is no message with the offset index} + COMMENT + COMMENT @see #getOffsetIndex + ARG 1 index + METHOD method_44546 streamForward (I)Lnet/minecraft/class_7555$class_7556; + COMMENT {@return the streams starting from {@code startIndex} with entires ordered + COMMENT chronologically (in ascending order)} + COMMENT + COMMENT @implNote If {@code startIndex} is not in the log, this returns {@link #emptyStreams}. + ARG 1 startIndex + METHOD method_44547 streamBackward (I)Lnet/minecraft/class_7555$class_7556; + COMMENT {@return the streams starting from {@code startIndex} with entires ordered + COMMENT antichronologically (in descending order)} + COMMENT + COMMENT @implNote If {@code startIndex} is not in the log, this returns {@link #emptyStreams}. + ARG 1 startIndex + CLASS 1 + FIELD field_39633 nextIndex I + CLASS class_7556 Streams + COMMENT A set of streams of logged messages. + FIELD field_39634 CHARACTERISTICS I + FIELD field_39635 log Lnet/minecraft/class_7555; + FIELD field_39636 indicesIterator Ljava/util/PrimitiveIterator$OfInt; + METHOD (Lnet/minecraft/class_7555;Ljava/util/PrimitiveIterator$OfInt;)V + ARG 1 log + ARG 2 indicesIterator + METHOD method_44548 streamIndices ()Ljava/util/stream/IntStream; + COMMENT {@return the stream of message indices} + METHOD method_44549 streamMessages ()Ljava/util/stream/Stream; + COMMENT {@return the stream of messages} + COMMENT + COMMENT

If for some reason the index is no longer present in the log, such messages are + COMMENT ignored. + METHOD method_44550 streamIndexedMessages ()Ljava/util/stream/Stream; + COMMENT {@return the stream of indexed messages} + COMMENT + COMMENT

If for some reason the index is no longer present in the log, such messages are + COMMENT ignored. diff --git a/mappings/net/minecraft/client/network/chat/ChatLogImpl.mapping b/mappings/net/minecraft/client/network/chat/ChatLogImpl.mapping new file mode 100644 index 0000000000..6ac9328434 --- /dev/null +++ b/mappings/net/minecraft/client/network/chat/ChatLogImpl.mapping @@ -0,0 +1,22 @@ +CLASS net/minecraft/class_7561 net/minecraft/client/network/chat/ChatLogImpl + COMMENT An implementation of {@link ChatLog} using a fixed-size array and {@code 0} as the + COMMENT starting index. When adding a log, the index is incremented, and the message at the + COMMENT index is overwritten. If the index goes above the array size, the array index wraps + COMMENT around but the message index is still incremented. + COMMENT + COMMENT

For example, if the size is {@code 10}, after adding the 10th item, the next index is + COMMENT {@code 10} because the log is 0-indexed. However, the next message will be stored at + COMMENT {@code messages[0]}. Use {@link #wrapIndex} to calculate the wrapped index. + FIELD field_39638 messages [Lnet/minecraft/class_7557; + FIELD field_39639 maxIndex I + FIELD field_39640 minIndex I + METHOD (I)V + ARG 1 maxMessages + METHOD method_44559 incrementIndex ()I + COMMENT {@return the incremented index} + COMMENT + COMMENT @implNote This always increments {@link #maxIndex}, and increments {@link #minIndex} + COMMENT only if the array is already full. + METHOD method_44560 wrapIndex (I)I + COMMENT {@return the message {@code index} wrapped for accessing the backing array} + ARG 1 index diff --git a/mappings/net/minecraft/client/network/chat/ReceivedMessage.mapping b/mappings/net/minecraft/client/network/chat/ReceivedMessage.mapping new file mode 100644 index 0000000000..455bfc3468 --- /dev/null +++ b/mappings/net/minecraft/client/network/chat/ReceivedMessage.mapping @@ -0,0 +1,52 @@ +CLASS net/minecraft/class_7557 net/minecraft/client/network/chat/ReceivedMessage + COMMENT A message received by the client and stored in {@link ChatLog}. + COMMENT + COMMENT

This includes both {@linkplain net.minecraft.network.packet.s2c.play.ChatMessageS2CPacket + COMMENT chat messages} and {@linkplain net.minecraft.network.packet.s2c.play.GameMessageS2CPacket + COMMENT game messages}. + METHOD method_44551 getContent ()Lnet/minecraft/class_2561; + COMMENT {@return the content of the message} + COMMENT + COMMENT @implNote If the message is a chat message and it contains an unsigned part, the unsigned + COMMENT part will be returned. Note that in vanilla, unsigned part is stripped prior to + COMMENT construction of the received message instance if the client requires secure chat. + METHOD method_44552 of (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_2561;Lnet/minecraft/class_7471;)Lnet/minecraft/class_7557; + COMMENT {@return the received message constructed from a chat message's elements} + ARG 0 gameProfile + COMMENT the game profile of the message's sender + ARG 1 displayName + COMMENT the displayed name of the sender + ARG 2 message + COMMENT the message content + METHOD method_44553 isSentFrom (Ljava/util/UUID;)Z + COMMENT {@return whether the sender's UUID equals {@code uuid}} + ARG 1 uuid + METHOD method_44554 of (Lnet/minecraft/class_2561;Ljava/time/Instant;)Lnet/minecraft/class_7557; + COMMENT {@return the received message constructed from a game message's elements} + ARG 0 message + COMMENT the message content + ARG 1 timestamp + COMMENT the timestamp of the message + METHOD method_44555 getNarration ()Lnet/minecraft/class_2561; + COMMENT {@return the narration of the message (by default, the content)} + CLASS class_7558 ChatMessage + COMMENT A chat message received by the client. + FIELD field_39637 DATE_TIME_FORMATTER Ljava/time/format/DateTimeFormatter; + METHOD method_44556 getHeadingText ()Lnet/minecraft/class_2561; + COMMENT {@return the heading text used by Chat Selection screen} + COMMENT + COMMENT

The text contains the sender's display name and the formatted timestamp. + METHOD method_44557 getSenderUuid ()Ljava/util/UUID; + COMMENT {@return the UUID of the sender} + METHOD method_44558 getFormattedTimestamp ()Lnet/minecraft/class_2561; + COMMENT {@return the formatted timestamp text of this message} + CLASS class_7559 GameMessage + COMMENT A game message received by the client. + FIELD comp_872 timestamp Ljava/time/Instant; + METHOD comp_872 timestamp ()Ljava/time/Instant; + CLASS class_7560 IndexedMessage + COMMENT A pair of the message's index and the message itself. + COMMENT + COMMENT @see ChatLog + FIELD comp_873 index I + METHOD comp_873 index ()I diff --git a/mappings/net/minecraft/network/message/SignedMessage.mapping b/mappings/net/minecraft/network/message/SignedMessage.mapping index b5ce4d0c12..839237689f 100644 --- a/mappings/net/minecraft/network/message/SignedMessage.mapping +++ b/mappings/net/minecraft/network/message/SignedMessage.mapping @@ -53,3 +53,7 @@ CLASS net/minecraft/class_7471 net/minecraft/network/message/SignedMessage ARG 1 decoratedContent ARG 2 signature ARG 3 previewed + METHOD method_44607 withoutUnsigned ()Lnet/minecraft/class_7471; + COMMENT {@return the signed chat message with {@link #unsignedContent} removed if it exists} + COMMENT + COMMENT @implNote This returns itself if the message does not have an unsigned content. diff --git a/mappings/net/minecraft/screen/ScreenTexts.mapping b/mappings/net/minecraft/screen/ScreenTexts.mapping index dfaabf8a29..bd3c6f5479 100644 --- a/mappings/net/minecraft/screen/ScreenTexts.mapping +++ b/mappings/net/minecraft/screen/ScreenTexts.mapping @@ -11,6 +11,7 @@ CLASS net/minecraft/class_5244 net/minecraft/screen/ScreenTexts FIELD field_33849 LINE_BREAK Lnet/minecraft/class_2561; FIELD field_33850 SENTENCE_SEPARATOR Lnet/minecraft/class_2561; FIELD field_39003 EMPTY Lnet/minecraft/class_2561; + FIELD field_39678 ELLIPSIS Lnet/minecraft/class_2561; METHOD method_30619 composeToggleText (Lnet/minecraft/class_2561;Z)Lnet/minecraft/class_5250; ARG 0 text ARG 1 value