From 543f056e08c81f5adfd8d6171f7fad30224bb96e Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Wed, 6 Jul 2022 20:57:17 +0900 Subject: [PATCH] 1.19.1-pre2 stuff (#3228) * 1.19.1-pre2 stuff * Update mappings/net/minecraft/client/gui/hud/MessageIndicator.mapping Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> --- .../minecraft/client/MinecraftClient.mapping | 4 +++ .../minecraft/client/gui/hud/ChatHud.mapping | 29 ++++++++++++++++++ .../client/gui/hud/ChatHudLine.mapping | 5 ++++ .../client/gui/hud/InGameHud.mapping | 1 + .../client/gui/hud/MessageIndicator.mapping | 25 ++++++++++++++++ .../client/gui/screen/ChatScreen.mapping | 1 + .../report/AbuseReportReasonScreen.mapping | 1 + .../ChatReportScreen.mapping | 2 +- .../screen/report/ChatSelectionScreen.mapping | 15 +++++++++- .../network/message/MessageHandler.mapping | 30 +++++++++++++++++++ .../message/MessageTrustStatus.mapping | 8 +++++ .../client/option/GameOptions.mapping | 5 ++++ .../client/option/NarratorMode.mapping | 2 ++ .../client/realms/RepeatedNarrator.mapping | 2 ++ .../AbuseReportSender.mapping | 2 +- .../ChatAbuseReport.mapping | 2 +- .../MessagesListAdder.mapping | 2 +- .../client/report/ReceivedMessage.mapping | 3 ++ .../client/util/NarratorManager.mapping | 5 ++++ .../net/minecraft/client/util/Session.mapping | 2 ++ .../entity/player/PlayerEntity.mapping | 5 +--- .../network/message/MessageSender.mapping | 3 +- .../network/message/MessageType.mapping | 24 ++++++--------- .../network/message/SignedMessage.mapping | 6 ++++ .../c2s/play/ChatMessageC2SPacket.mapping | 12 +++++--- .../play/CommandExecutionC2SPacket.mapping | 14 +++++---- .../s2c/play/ChatMessageS2CPacket.mapping | 13 ++++---- .../minecraft/server/PlayerManager.mapping | 28 +++++++++-------- .../server/network/ServerPlayerEntity.mapping | 12 ++++++-- .../minecraft/text/StringVisitable.mapping | 1 - mappings/net/minecraft/text/Text.mapping | 4 +++ 31 files changed, 211 insertions(+), 57 deletions(-) create mode 100644 mappings/net/minecraft/client/gui/hud/MessageIndicator.mapping rename mappings/net/minecraft/client/gui/screen/{abusereport => report}/ChatReportScreen.mapping (97%) create mode 100644 mappings/net/minecraft/client/network/message/MessageHandler.mapping create mode 100644 mappings/net/minecraft/client/network/message/MessageTrustStatus.mapping rename mappings/net/minecraft/client/{network/abusereport => report}/AbuseReportSender.mapping (91%) rename mappings/net/minecraft/client/{network/abusereport => report}/ChatAbuseReport.mapping (96%) rename mappings/net/minecraft/client/{network/abusereport => report}/MessagesListAdder.mapping (93%) diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 1a253e7e86..5e9a332df2 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -177,6 +177,8 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_39421 servicesSignatureVerifier Lnet/minecraft/class_7500; FIELD field_39492 abuseReportContext Lnet/minecraft/class_7574; FIELD field_39718 realmsPeriodicCheckers Lnet/minecraft/class_7578; + FIELD field_39769 narratorManager Lnet/minecraft/class_333; + FIELD field_39770 messageHandler Lnet/minecraft/class_7594; METHOD (Lnet/minecraft/class_542;)V ARG 1 args METHOD method_1476 checkIs64Bit ()Z @@ -504,6 +506,8 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_44648 (Z)V ARG 1 confirmed METHOD method_44649 isMultiplayerBanned ()Z + METHOD method_44713 getNarratorManager ()Lnet/minecraft/class_333; + METHOD method_44714 getMessageHandler ()Lnet/minecraft/class_7594; CLASS class_5859 ChatRestriction COMMENT Represents the restrictions on chat on a Minecraft client. COMMENT diff --git a/mappings/net/minecraft/client/gui/hud/ChatHud.mapping b/mappings/net/minecraft/client/gui/hud/ChatHud.mapping index 41094453d2..39776b4e51 100644 --- a/mappings/net/minecraft/client/gui/hud/ChatHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/ChatHud.mapping @@ -13,6 +13,7 @@ CLASS net/minecraft/class_338 net/minecraft/client/gui/hud/ChatHud FIELD field_23934 messageQueue Ljava/util/Deque; FIELD field_23935 lastMessageAddedTime J FIELD field_32180 MAX_MESSAGES I + FIELD field_39771 MISSING_MESSAGE_INDEX I METHOD (Lnet/minecraft/class_310;)V ARG 1 client METHOD method_1802 scroll (I)V @@ -21,6 +22,7 @@ CLASS net/minecraft/class_338 net/minecraft/client/gui/hud/ChatHud ARG 1 message METHOD method_1804 addMessage (Lnet/minecraft/class_2561;Lnet/minecraft/class_7591;)V ARG 1 message + ARG 2 indicator METHOD method_1805 render (Lnet/minecraft/class_4587;I)V ARG 1 matrices ARG 2 tickDelta @@ -38,6 +40,7 @@ CLASS net/minecraft/class_338 net/minecraft/client/gui/hud/ChatHud METHOD method_1815 addMessage (Lnet/minecraft/class_2561;ILnet/minecraft/class_7591;Z)V ARG 1 message ARG 2 messageId + ARG 3 indicator ARG 4 refresh METHOD method_1816 getTextStyleAt (DD)Lnet/minecraft/class_2583; ARG 1 x @@ -55,7 +58,33 @@ CLASS net/minecraft/class_338 net/minecraft/client/gui/hud/ChatHud ARG 3 mouseY METHOD method_27147 queueMessage (Lnet/minecraft/class_2561;Lnet/minecraft/class_7591;)V ARG 1 message + ARG 2 indicator METHOD method_27148 getChatDelayMillis ()J METHOD method_27149 processMessageQueue ()V METHOD method_41831 getDefaultUnfocusedHeight ()D METHOD method_44047 getChatScreen ()Lnet/minecraft/class_408; + METHOD method_44718 isXInsideIndicatorIcon (DLnet/minecraft/class_303$class_7590;Lnet/minecraft/class_7591;)Z + ARG 1 x + ARG 3 line + ARG 4 indicator + METHOD method_44719 drawIndicatorIcon (Lnet/minecraft/class_4587;IILnet/minecraft/class_7591$class_7592;)V + ARG 1 matrices + ARG 2 x + ARG 3 y + ARG 4 icon + METHOD method_44720 getIndicatorX (Lnet/minecraft/class_303$class_7590;)I + ARG 1 line + METHOD method_44721 queueMessage (Lnet/minecraft/class_2561;)V + ARG 1 message + METHOD method_44722 toChatLineX (D)D + ARG 1 x + METHOD method_44723 getIndicatorAt (DD)Lnet/minecraft/class_7591; + ARG 1 mouseX + ARG 3 mouseY + METHOD method_44724 toChatLineY (D)D + ARG 1 y + METHOD method_44725 getMessageIndex (D)I + ARG 1 y + CLASS class_7593 MessageWithIndicator + FIELD comp_904 indicator Lnet/minecraft/class_7591; + METHOD comp_904 indicator ()Lnet/minecraft/class_7591; diff --git a/mappings/net/minecraft/client/gui/hud/ChatHudLine.mapping b/mappings/net/minecraft/client/gui/hud/ChatHudLine.mapping index 153f90071e..1141a09ead 100644 --- a/mappings/net/minecraft/client/gui/hud/ChatHudLine.mapping +++ b/mappings/net/minecraft/client/gui/hud/ChatHudLine.mapping @@ -1,5 +1,10 @@ CLASS net/minecraft/class_303 net/minecraft/client/gui/hud/ChatHudLine FIELD comp_892 creationTick I + FIELD comp_894 indicator Lnet/minecraft/class_7591; METHOD (ILnet/minecraft/class_2561;Lnet/minecraft/class_7591;)V ARG 1 creationTick METHOD comp_892 creationTick ()I + METHOD comp_894 indicator ()Lnet/minecraft/class_7591; + CLASS class_7590 Visible + FIELD comp_897 indicator Lnet/minecraft/class_7591; + METHOD comp_897 indicator ()Lnet/minecraft/class_7591; diff --git a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping index e0eaf05c66..b0ef7ff6fb 100644 --- a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping @@ -39,6 +39,7 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud FIELD field_27959 spyglassScale F FIELD field_27960 POWDER_SNOW_OUTLINE Lnet/minecraft/class_2960; FIELD field_32167 WHITE I + FIELD field_32171 SCOREBOARD_JOINER Ljava/lang/String; FIELD field_35428 autosaveIndicatorAlpha F FIELD field_35429 lastAutosaveIndicatorAlpha F FIELD field_35430 SAVING_LEVEL_TEXT Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/client/gui/hud/MessageIndicator.mapping b/mappings/net/minecraft/client/gui/hud/MessageIndicator.mapping new file mode 100644 index 0000000000..b3a16b019c --- /dev/null +++ b/mappings/net/minecraft/client/gui/hud/MessageIndicator.mapping @@ -0,0 +1,25 @@ +CLASS net/minecraft/class_7591 net/minecraft/client/gui/hud/MessageIndicator + FIELD comp_902 loggedName Ljava/lang/String; + FIELD field_39756 NOT_SECURE_TEXT Lnet/minecraft/class_2561; + FIELD field_39757 MODIFIED_TEXT Lnet/minecraft/class_2561; + FIELD field_39758 NOT_SECURE_COLOR I + FIELD field_39759 MODIFIED_COLOR I + FIELD field_39761 CHAT_TAGS_TEXTURE Lnet/minecraft/class_2960; + METHOD comp_902 loggedName ()Ljava/lang/String; + METHOD method_44709 notSecure ()Lnet/minecraft/class_7591; + METHOD method_44710 modified (Lnet/minecraft/class_2561;)Lnet/minecraft/class_7591; + ARG 0 originalText + CLASS class_7592 Icon + FIELD field_39764 u I + FIELD field_39765 v I + FIELD field_39766 width I + FIELD field_39767 height I + METHOD (Ljava/lang/String;IIIII)V + ARG 3 u + ARG 4 v + ARG 5 width + ARG 6 height + METHOD method_44712 draw (Lnet/minecraft/class_4587;II)V + ARG 1 matrices + ARG 2 x + ARG 3 y diff --git a/mappings/net/minecraft/client/gui/screen/ChatScreen.mapping b/mappings/net/minecraft/client/gui/screen/ChatScreen.mapping index ca8b4bc81e..41d479e668 100644 --- a/mappings/net/minecraft/client/gui/screen/ChatScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ChatScreen.mapping @@ -19,6 +19,7 @@ CLASS net/minecraft/class_408 net/minecraft/client/gui/screen/ChatScreen FIELD field_39345 CHAT_PREVIEW_WARNING_TOAST_TEXT Lnet/minecraft/class_2561; FIELD field_39346 CHAT_PREVIEW_PLACEHOLDER_TEXT Lnet/minecraft/class_2561; FIELD field_39347 chatPreviewer Lnet/minecraft/class_7479; + FIELD field_39774 MAX_INDICATOR_TOOLTIP_WIDTH I METHOD (Ljava/lang/String;)V ARG 1 originalChatText METHOD method_2108 setText (Ljava/lang/String;)V diff --git a/mappings/net/minecraft/client/gui/screen/report/AbuseReportReasonScreen.mapping b/mappings/net/minecraft/client/gui/screen/report/AbuseReportReasonScreen.mapping index 22d0aa5a16..1ef927c00a 100644 --- a/mappings/net/minecraft/client/gui/screen/report/AbuseReportReasonScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/report/AbuseReportReasonScreen.mapping @@ -11,6 +11,7 @@ CLASS net/minecraft/class_7551 net/minecraft/client/gui/screen/report/AbuseRepor FIELD field_39735 TOP_MARGIN I FIELD field_39753 ABOUT_JAVA_REPORTING_URL Ljava/lang/String; FIELD field_39754 READ_INFO_TEXT Lnet/minecraft/class_2561; + FIELD field_39778 reason Lnet/minecraft/class_7573; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_7573;Ljava/util/function/Consumer;)V ARG 1 parent ARG 2 reason diff --git a/mappings/net/minecraft/client/gui/screen/abusereport/ChatReportScreen.mapping b/mappings/net/minecraft/client/gui/screen/report/ChatReportScreen.mapping similarity index 97% rename from mappings/net/minecraft/client/gui/screen/abusereport/ChatReportScreen.mapping rename to mappings/net/minecraft/client/gui/screen/report/ChatReportScreen.mapping index 8215063a1d..d9638c3757 100644 --- a/mappings/net/minecraft/client/gui/screen/abusereport/ChatReportScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/report/ChatReportScreen.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_7538 net/minecraft/client/gui/screen/abusereport/ChatReportScreen +CLASS net/minecraft/class_7538 net/minecraft/client/gui/screen/report/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; diff --git a/mappings/net/minecraft/client/gui/screen/report/ChatSelectionScreen.mapping b/mappings/net/minecraft/client/gui/screen/report/ChatSelectionScreen.mapping index 5635bab6de..da688e606e 100644 --- a/mappings/net/minecraft/client/gui/screen/report/ChatSelectionScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/report/ChatSelectionScreen.mapping @@ -63,10 +63,16 @@ CLASS net/minecraft/class_7543 net/minecraft/client/gui/screen/report/ChatSelect FIELD field_39750 CHECKMARK Lnet/minecraft/class_2960; FIELD field_39751 CHECKMARK_WIDTH I FIELD field_39752 CHECKMARK_HEIGHT I + FIELD field_39775 INDICATOR_LEFT_MARGIN I + FIELD field_39776 indicatorIcon Lnet/minecraft/class_7591$class_7592; + FIELD field_39777 originalContent Ljava/util/List; METHOD (Lnet/minecraft/class_7543$class_7544;ILnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_7591;ZZ)V ARG 2 index + ARG 3 message ARG 4 narration - ARG 6 isChatMessage + ARG 5 indicator + ARG 6 fromReportedPlayer + ARG 7 isChatMessage METHOD method_44517 toggle ()Z METHOD method_44666 getTextWidth ()I METHOD method_44667 getIndent ()I @@ -75,6 +81,13 @@ CLASS net/minecraft/class_7543 net/minecraft/client/gui/screen/report/ChatSelect ARG 2 y ARG 3 x ARG 4 entryHeight + METHOD method_44729 renderIndicator (Lnet/minecraft/class_4587;IIIII)V + ARG 1 matrices + ARG 2 x + ARG 3 y + ARG 4 entryHeight + ARG 5 mouseX + ARG 6 mouseY CLASS class_7549 SenderEntry FIELD field_39607 PLAYER_SKIN_SIZE I FIELD field_39608 headingText Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/client/network/message/MessageHandler.mapping b/mappings/net/minecraft/client/network/message/MessageHandler.mapping new file mode 100644 index 0000000000..bec2ce82a2 --- /dev/null +++ b/mappings/net/minecraft/client/network/message/MessageHandler.mapping @@ -0,0 +1,30 @@ +CLASS net/minecraft/class_7594 net/minecraft/client/network/message/MessageHandler + FIELD field_39779 client Lnet/minecraft/class_310; + METHOD (Lnet/minecraft/class_310;)V + ARG 1 client + METHOD method_44731 getPlayerListEntry (Lnet/minecraft/class_7436;)Lnet/minecraft/class_640; + ARG 1 sender + METHOD method_44732 getStatus (Lnet/minecraft/class_7436;Lnet/minecraft/class_7471;Lnet/minecraft/class_2561;Lnet/minecraft/class_640;)Lnet/minecraft/class_7595; + ARG 1 sender + ARG 2 message + ARG 3 decorated + ARG 4 senderEntry + METHOD method_44733 onChatMessage (Lnet/minecraft/class_2556;Lnet/minecraft/class_7471;Lnet/minecraft/class_7436;)V + ARG 1 type + ARG 2 message + ARG 3 sender + METHOD method_44734 extractSender (Lnet/minecraft/class_2561;)Ljava/util/UUID; + ARG 1 text + METHOD method_44735 addToChatLog (Lnet/minecraft/class_2561;Ljava/time/Instant;)V + ARG 1 message + ARG 2 timestamp + METHOD method_44736 onGameMessage (Lnet/minecraft/class_2561;Z)V + ARG 1 message + ARG 2 overlay + METHOD method_44737 addToChatLog (Lnet/minecraft/class_7471;Lnet/minecraft/class_7436;Lnet/minecraft/class_640;Lnet/minecraft/class_7595;)V + ARG 1 message + ARG 2 sender + ARG 3 senderEntry + ARG 4 trustStatus + METHOD method_44738 isAlwaysTrusted (Lnet/minecraft/class_7436;)Z + ARG 1 sender diff --git a/mappings/net/minecraft/client/network/message/MessageTrustStatus.mapping b/mappings/net/minecraft/client/network/message/MessageTrustStatus.mapping new file mode 100644 index 0000000000..dfd13a293e --- /dev/null +++ b/mappings/net/minecraft/client/network/message/MessageTrustStatus.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_7595 net/minecraft/client/network/message/MessageTrustStatus + METHOD method_44740 isInsecure ()Z + METHOD method_44741 createIndicator (Lnet/minecraft/class_7471;)Lnet/minecraft/class_7591; + ARG 1 message + METHOD method_44742 getStatus (Lnet/minecraft/class_7471;Lnet/minecraft/class_2561;Lnet/minecraft/class_640;)Lnet/minecraft/class_7595; + ARG 0 message + ARG 1 decorated + ARG 2 sender diff --git a/mappings/net/minecraft/client/option/GameOptions.mapping b/mappings/net/minecraft/client/option/GameOptions.mapping index 90ae15d9fa..989f4a745f 100644 --- a/mappings/net/minecraft/client/option/GameOptions.mapping +++ b/mappings/net/minecraft/client/option/GameOptions.mapping @@ -385,6 +385,8 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions ARG 0 cloudRenderMode METHOD method_42460 (Lnet/minecraft/class_5365;)V ARG 0 value + METHOD method_42463 (Lnet/minecraft/class_4065;)V + ARG 1 value METHOD method_42464 (Lnet/minecraft/class_7172;Lnet/minecraft/class_5365;)V ARG 0 option ARG 1 graphicsMode @@ -414,6 +416,9 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions ARG 0 cloudRenderMode METHOD method_42486 (Lnet/minecraft/class_5365;)Z ARG 0 graphicsMode + METHOD method_42489 (Lnet/minecraft/class_2561;Lnet/minecraft/class_4065;)Lnet/minecraft/class_2561; + ARG 1 optionText + ARG 2 value METHOD method_42491 (Lnet/minecraft/class_2561;Ljava/lang/Boolean;)Lnet/minecraft/class_2561; ARG 0 optionText ARG 1 value diff --git a/mappings/net/minecraft/client/option/NarratorMode.mapping b/mappings/net/minecraft/client/option/NarratorMode.mapping index d1f94780d6..23f351ac75 100644 --- a/mappings/net/minecraft/client/option/NarratorMode.mapping +++ b/mappings/net/minecraft/client/option/NarratorMode.mapping @@ -9,3 +9,5 @@ CLASS net/minecraft/class_4065 net/minecraft/client/option/NarratorMode METHOD method_18510 byId (I)Lnet/minecraft/class_4065; ARG 0 id METHOD method_18511 getName ()Lnet/minecraft/class_2561; + METHOD method_44715 shouldNarrateChat ()Z + METHOD method_44716 shouldNarrateSystem ()Z diff --git a/mappings/net/minecraft/client/realms/RepeatedNarrator.mapping b/mappings/net/minecraft/client/realms/RepeatedNarrator.mapping index 56370fbb03..effab2b04a 100644 --- a/mappings/net/minecraft/client/realms/RepeatedNarrator.mapping +++ b/mappings/net/minecraft/client/realms/RepeatedNarrator.mapping @@ -4,6 +4,8 @@ CLASS net/minecraft/class_4907 net/minecraft/client/realms/RepeatedNarrator METHOD (Ljava/time/Duration;)V ARG 1 duration METHOD method_25499 narrate (Lnet/minecraft/class_333;Lnet/minecraft/class_2561;)V + ARG 1 narratorManager + ARG 2 text METHOD method_25500 (Lnet/minecraft/class_2561;Lnet/minecraft/class_4907$class_4908;)Lnet/minecraft/class_4907$class_4908; ARG 2 parameters CLASS class_4908 Parameters diff --git a/mappings/net/minecraft/client/network/abusereport/AbuseReportSender.mapping b/mappings/net/minecraft/client/report/AbuseReportSender.mapping similarity index 91% rename from mappings/net/minecraft/client/network/abusereport/AbuseReportSender.mapping rename to mappings/net/minecraft/client/report/AbuseReportSender.mapping index bc68a97ae6..7dce641be8 100644 --- a/mappings/net/minecraft/client/network/abusereport/AbuseReportSender.mapping +++ b/mappings/net/minecraft/client/report/AbuseReportSender.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_7563 net/minecraft/client/network/abusereport/AbuseReportSender +CLASS net/minecraft/class_7563 net/minecraft/client/report/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 diff --git a/mappings/net/minecraft/client/network/abusereport/ChatAbuseReport.mapping b/mappings/net/minecraft/client/report/ChatAbuseReport.mapping similarity index 96% rename from mappings/net/minecraft/client/network/abusereport/ChatAbuseReport.mapping rename to mappings/net/minecraft/client/report/ChatAbuseReport.mapping index bcd9392505..96507b2b77 100644 --- a/mappings/net/minecraft/client/network/abusereport/ChatAbuseReport.mapping +++ b/mappings/net/minecraft/client/report/ChatAbuseReport.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_7566 net/minecraft/client/network/abusereport/ChatAbuseReport +CLASS net/minecraft/class_7566 net/minecraft/client/report/ChatAbuseReport FIELD field_39645 CHAT Ljava/lang/String; FIELD field_39648 id Ljava/util/UUID; FIELD field_39649 timestamp Ljava/time/Instant; diff --git a/mappings/net/minecraft/client/network/abusereport/MessagesListAdder.mapping b/mappings/net/minecraft/client/report/MessagesListAdder.mapping similarity index 93% rename from mappings/net/minecraft/client/network/abusereport/MessagesListAdder.mapping rename to mappings/net/minecraft/client/report/MessagesListAdder.mapping index 800841015b..9d78b2170a 100644 --- a/mappings/net/minecraft/client/network/abusereport/MessagesListAdder.mapping +++ b/mappings/net/minecraft/client/report/MessagesListAdder.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_7541 net/minecraft/client/network/abusereport/MessagesListAdder +CLASS net/minecraft/class_7541 net/minecraft/client/report/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; diff --git a/mappings/net/minecraft/client/report/ReceivedMessage.mapping b/mappings/net/minecraft/client/report/ReceivedMessage.mapping index bda4fb54b6..c5071442a5 100644 --- a/mappings/net/minecraft/client/report/ReceivedMessage.mapping +++ b/mappings/net/minecraft/client/report/ReceivedMessage.mapping @@ -18,6 +18,7 @@ CLASS net/minecraft/class_7557 net/minecraft/client/report/ReceivedMessage COMMENT the displayed name of the sender ARG 2 message COMMENT the message content + ARG 3 trustStatus METHOD method_44553 isSentFrom (Ljava/util/UUID;)Z COMMENT {@return whether the sender's UUID equals {@code uuid}} ARG 1 uuid @@ -31,7 +32,9 @@ CLASS net/minecraft/class_7557 net/minecraft/client/report/ReceivedMessage COMMENT {@return the narration of the message (by default, the content)} CLASS class_7558 ChatMessage COMMENT A chat message received by the client. + FIELD comp_905 trustStatus Lnet/minecraft/class_7595; FIELD field_39637 DATE_TIME_FORMATTER Ljava/time/format/DateTimeFormatter; + METHOD comp_905 trustStatus ()Lnet/minecraft/class_7595; METHOD method_44556 getHeadingText ()Lnet/minecraft/class_2561; COMMENT {@return the heading text used by Chat Selection screen} COMMENT diff --git a/mappings/net/minecraft/client/util/NarratorManager.mapping b/mappings/net/minecraft/client/util/NarratorManager.mapping index 52af4e95c5..42dfcd4736 100644 --- a/mappings/net/minecraft/client/util/NarratorManager.mapping +++ b/mappings/net/minecraft/client/util/NarratorManager.mapping @@ -2,6 +2,9 @@ CLASS net/minecraft/class_333 net/minecraft/client/util/NarratorManager FIELD field_18210 LOGGER Lorg/slf4j/Logger; FIELD field_18967 EMPTY Lnet/minecraft/class_2561; FIELD field_2055 narrator Lcom/mojang/text2speech/Narrator; + FIELD field_39755 client Lnet/minecraft/class_310; + METHOD (Lnet/minecraft/class_310;)V + ARG 1 client METHOD method_1791 isActive ()Z METHOD method_1792 addToast (Lnet/minecraft/class_4065;)V ARG 1 option @@ -14,3 +17,5 @@ CLASS net/minecraft/class_333 net/minecraft/client/util/NarratorManager ARG 1 text METHOD method_37016 debugPrintMessage (Ljava/lang/String;)V ARG 1 message + METHOD method_44708 narrateChatMessage (Ljava/util/function/Supplier;)V + ARG 1 messageSupplier diff --git a/mappings/net/minecraft/client/util/Session.mapping b/mappings/net/minecraft/client/util/Session.mapping index 754fa090f2..7570dfe065 100644 --- a/mappings/net/minecraft/client/util/Session.mapping +++ b/mappings/net/minecraft/client/util/Session.mapping @@ -20,6 +20,8 @@ CLASS net/minecraft/class_320 net/minecraft/client/util/Session METHOD method_35718 getAccountType ()Lnet/minecraft/class_320$class_321; METHOD method_38740 getClientId ()Ljava/util/Optional; METHOD method_38741 getXuid ()Ljava/util/Optional; + METHOD method_44717 getUuidOrNull ()Ljava/util/UUID; + COMMENT {@return the UUID, or {@code null} if it is invalid} CLASS class_321 AccountType FIELD field_1986 name Ljava/lang/String; FIELD field_1989 BY_NAME Ljava/util/Map; diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index f53fa32ce7..2b41b6b58b 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -306,10 +306,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity COMMENT @see net.minecraft.client.gui.hud.InGameHud#setOverlayMessage ARG 1 message COMMENT the message to add - ARG 2 actionBar - COMMENT {@code true} to show the message as an overlay; {@code false} to add the - COMMENT message to {@linkplain net.minecraft.client.gui.hud.ChatHud the chat - COMMENT hud} + ARG 2 overlay METHOD method_7355 sendAbilitiesUpdate ()V METHOD method_7356 getShoulderEntityLeft ()Lnet/minecraft/class_2487; METHOD method_7357 getItemCooldownManager ()Lnet/minecraft/class_1796; diff --git a/mappings/net/minecraft/network/message/MessageSender.mapping b/mappings/net/minecraft/network/message/MessageSender.mapping index 299f291e1e..7baf6535ac 100644 --- a/mappings/net/minecraft/network/message/MessageSender.mapping +++ b/mappings/net/minecraft/network/message/MessageSender.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_7436 net/minecraft/network/message/MessageSender COMMENT COMMENT

An instance can be obtained via {@link net.minecraft.entity.Entity#asMessageSender}. METHOD (Ljava/util/UUID;Lnet/minecraft/class_2561;)V - ARG 1 uuid + ARG 1 profileId ARG 2 name METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf @@ -13,3 +13,4 @@ CLASS net/minecraft/class_7436 net/minecraft/network/message/MessageSender ARG 0 name METHOD method_43842 withTeamName (Lnet/minecraft/class_2561;)Lnet/minecraft/class_7436; ARG 1 teamName + METHOD method_44744 hasProfileId ()Z diff --git a/mappings/net/minecraft/network/message/MessageType.mapping b/mappings/net/minecraft/network/message/MessageType.mapping index 10c5228512..e74be16679 100644 --- a/mappings/net/minecraft/network/message/MessageType.mapping +++ b/mappings/net/minecraft/network/message/MessageType.mapping @@ -1,27 +1,21 @@ CLASS net/minecraft/class_2556 net/minecraft/network/message/MessageType - COMMENT A message type (also known as "chat type") controls whether to display or narrate - COMMENT the messages sent to the clients, and if so, how. Message types are registered - COMMENT at {@link net.minecraft.util.registry.BuiltinRegistries#MESSAGE_TYPE}. When - COMMENT sending a message, the registry key of the message type can be passed to indicate + COMMENT A message type (also known as "chat type") controls how to display or narrate + COMMENT the chat messages sent to the clients. Message types are registered at + COMMENT {@link net.minecraft.util.registry.BuiltinRegistries#MESSAGE_TYPE}. When + COMMENT sending a chat message, the registry key of the message type can be passed to indicate COMMENT which message type should be used. COMMENT - COMMENT

Message type has three fields, all of which are optional. If the field is empty, - COMMENT the message is not displayed or narrated there. + COMMENT

Message type has two fields. COMMENT

    COMMENT
  • {@link #chat} controls the content displayed in the {@linkplain COMMENT net.minecraft.client.gui.hud.ChatHud chat hud}.
    • - COMMENT
  • {@link #overlay} controls the content displayed as the overlay (above the hotbar).
    • COMMENT
  • {@link #narration} controls the narrated content.
    • COMMENT
COMMENT - COMMENT

The display rules and the narration rule can optionally have a "decoration", which is an - COMMENT instance of {@link Decoration}. Decorations are pre-defined message formatting and - COMMENT styling rules, which can be {@linkplain Decoration#apply applied} to the message to - COMMENT produce the displayed or narrated text. If there is no decoration, the message is used - COMMENT without any extra processing. See the documentation for {@link MessageType.DisplayRule} - COMMENT and {@link MessageType.NarrationRule} for details. - COMMENT - COMMENT @see net.minecraft.server.PlayerManager#broadcast(Text, RegistryKey) + COMMENT

The fields are "decoration", which is an instance of {@link Decoration}. + COMMENT Decorations are pre-defined message formatting and styling rules, which can be + COMMENT {@linkplain Decoration#apply applied} to the message to produce the displayed or + COMMENT narrated text. FIELD comp_792 Lnet/minecraft/class_7463; COMMENT the display rule for the content displayed in the chat hud, or COMMENT {@link Optional#empty()} if it should not be displayed in the chat hud diff --git a/mappings/net/minecraft/network/message/SignedMessage.mapping b/mappings/net/minecraft/network/message/SignedMessage.mapping index 839237689f..6cc8415fef 100644 --- a/mappings/net/minecraft/network/message/SignedMessage.mapping +++ b/mappings/net/minecraft/network/message/SignedMessage.mapping @@ -4,6 +4,8 @@ CLASS net/minecraft/class_7471 net/minecraft/network/message/SignedMessage COMMENT unsigned message due to the chat preview being disabled on either side. COMMENT COMMENT

Note that the signature itself might not be valid. + FIELD field_39786 SERVERBOUND_TIME_TO_LIVE Ljava/time/Duration; + FIELD field_39787 CLIENTBOUND_TIME_TO_LIVE Ljava/time/Duration; METHOD method_43867 verify (Lnet/minecraft/class_7428;)Z COMMENT {@return whether the message can be verified using the public key} ARG 1 key @@ -57,3 +59,7 @@ CLASS net/minecraft/class_7471 net/minecraft/network/message/SignedMessage 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. + METHOD method_44747 isExpiredOnServer (Ljava/time/Instant;)Z + ARG 1 currentTime + METHOD method_44748 isExpiredOnClient (Ljava/time/Instant;)Z + ARG 1 currentTime diff --git a/mappings/net/minecraft/network/packet/c2s/play/ChatMessageC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/ChatMessageC2SPacket.mapping index bb94d87ff8..086c13bae2 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/ChatMessageC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/ChatMessageC2SPacket.mapping @@ -6,12 +6,16 @@ CLASS net/minecraft/class_2797 net/minecraft/network/packet/c2s/play/ChatMessage COMMENT 256 characters, it will reject the message and disconnect the client. COMMENT COMMENT

If the message contains an invalid character (see {@link - COMMENT net.minecraft.SharedConstants#isValidChar isValidChar}), the server will + COMMENT net.minecraft.SharedConstants#isValidChar isValidChar}) or if the server + COMMENT receives the messages in improper order. the server will COMMENT reject the message and disconnect the client. COMMENT - COMMENT

Messages that took more than {@link #TIME_TO_LIVE} to reach the server - COMMENT are considered expired and log warnings on the server. Messages will be - COMMENT discarded if the server receives them in improper order. + COMMENT

Messages that took more than {@link SignedMessage#SERVERBOUND_TIME_TO_LIVE} + COMMENT to reach the server are considered expired and log warnings on the server. + COMMENT If the message takes more than {@link SignedMessage#CLIENTBOUND_TIME_TO_LIVE} + COMMENT to reach the clients (including the time it took to reach the server), the + COMMENT message is not considered secure anymore by the clients, and may be discarded + COMMENT depending on the clients' options. COMMENT COMMENT @see net.minecraft.client.network.ClientPlayerEntity#sendChatMessage COMMENT @see net.minecraft.server.network.ServerPlayNetworkHandler#onChatMessage diff --git a/mappings/net/minecraft/network/packet/c2s/play/CommandExecutionC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/CommandExecutionC2SPacket.mapping index a43ba5b2b8..f63e837734 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/CommandExecutionC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/CommandExecutionC2SPacket.mapping @@ -6,12 +6,16 @@ CLASS net/minecraft/class_7472 net/minecraft/network/packet/c2s/play/CommandExec COMMENT it will reject the message and disconnect the client. COMMENT COMMENT

If the command contains an invalid character (see {@link - COMMENT net.minecraft.SharedConstants#isValidChar isValidChar}), the server will - COMMENT reject the command and disconnect the client. + COMMENT net.minecraft.SharedConstants#isValidChar isValidChar}) or if the server receives + COMMENT the commands in improper order, the server will reject the command and disconnect + COMMENT the client. COMMENT - COMMENT

Commands that took more than {@link ChatMessageC2SPacket#TIME_TO_LIVE} to reach - COMMENT the server are considered expired and log warnings on the server. Commands will be - COMMENT discarded if the server receives them in improper order. + COMMENT

Commands that took more than {@link SignedMessage#SERVERBOUND_TIME_TO_LIVE} + COMMENT to reach the server are considered expired and log warnings on the server + COMMENT if it contains signed message arguments. If the message takes more than + COMMENT {@link SignedMessage#CLIENTBOUND_TIME_TO_LIVE} to reach the clients (including + COMMENT the time it took to reach the server), the message is not considered secure + COMMENT anymore by the clients, and may be discarded depending on the clients' options. COMMENT COMMENT @see net.minecraft.client.network.ClientPlayerEntity#sendCommand COMMENT @see net.minecraft.server.network.ServerPlayNetworkHandler#onCommandExecution diff --git a/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping index 9ac36058b3..f260bc5994 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping @@ -5,20 +5,19 @@ CLASS net/minecraft/class_7438 net/minecraft/network/packet/s2c/play/ChatMessage COMMENT raw message content is sent to the clients, and they will wrap it. To register COMMENT custom wrapping behaviors, check {@link MessageType#register}. COMMENT - COMMENT

Messages that took more than {@link #TIME_TO_LIVE} to reach the clients are - COMMENT considered expired. This is measured from the time the client sent the chat message - COMMENT to the server. Note that unlike {@link - COMMENT net.minecraft.network.packet.c2s.play.ChatMessageC2SPacket} expired messages are not - COMMENT discarded by the clients; they instead log a warning. - COMMENT COMMENT

Chat messages have signatures. It is possible to use a bogus signature - such as COMMENT {@link net.minecraft.network.message.MessageSignature#none} - to send a chat COMMENT message; however if the signature is invalid (e.g. because the text's content differs COMMENT from the one sent by the client, or because the passed signature is invalid) the client - COMMENT will log a warning. See {@link + COMMENT will show a warning and can discard it depending on the options. See {@link COMMENT net.minecraft.network.message.MessageSignature#updateSignature} for how the COMMENT message is signed. COMMENT + COMMENT

If the message takes more than {@link SignedMessage#CLIENTBOUND_TIME_TO_LIVE} + COMMENT to reach the clients (including the time it originally took to reach the server), + COMMENT the message is not considered secure anymore by the clients, and may be discarded + COMMENT depending on the clients' options. + COMMENT COMMENT @see net.minecraft.server.network.ServerPlayerEntity#sendChatMessage COMMENT @see net.minecraft.client.network.ClientPlayNetworkHandler#onChatMessage FIELD comp_761 timestamp Ljava/time/Instant; diff --git a/mappings/net/minecraft/server/PlayerManager.mapping b/mappings/net/minecraft/server/PlayerManager.mapping index c9248aa1cc..f86dcfd88a 100644 --- a/mappings/net/minecraft/server/PlayerManager.mapping +++ b/mappings/net/minecraft/server/PlayerManager.mapping @@ -144,7 +144,7 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager COMMENT Broadcasts a message to all players and the server console. A different COMMENT message can be sent to a different player. COMMENT - COMMENT @see #broadcast(Text, RegistryKey) + COMMENT @see #broadcast(Text, boolean) COMMENT @see #broadcast(FilteredMessage, ServerCommandSource, RegistryKey) COMMENT @see #broadcast(FilteredMessage, ServerPlayerEntity, RegistryKey) COMMENT @see #broadcast(SignedMessage, MessageSender, RegistryKey) @@ -154,6 +154,7 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager COMMENT a function that takes the player to send the message to COMMENT and returns either the text to send to them or {@code null} COMMENT to indicate the message should not be sent to them + ARG 3 overlay METHOD method_43513 broadcast (Lnet/minecraft/class_7471;Ljava/util/function/Function;Lnet/minecraft/class_7436;Lnet/minecraft/class_5321;)V COMMENT Broadcasts a chat message to all players and the server console. A different COMMENT message can be sent to a different player. @@ -162,7 +163,7 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager COMMENT {@link net.minecraft.network.message.MessageSignature#none} - to send a chat COMMENT message; however if the signature is invalid (e.g. because the text's content differs COMMENT from the one sent by the client, or because the passed signature is invalid) the client - COMMENT will log a warning. See {@link + COMMENT will show a warning and can discard it depending on the client's options. See {@link COMMENT net.minecraft.network.message.MessageSignature#updateSignature} for how the COMMENT message is signed. COMMENT @@ -171,8 +172,8 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager COMMENT as well as through commands like {@link net.minecraft.server.command.MeCommand} or COMMENT {@link net.minecraft.server.command.SayCommand} . COMMENT - COMMENT @see #broadcast(Text, RegistryKey) - COMMENT @see #broadcast(Text, Function, RegistryKey) + COMMENT @see #broadcast(Text, boolean) + COMMENT @see #broadcast(Text, Function, boolean) COMMENT @see #broadcast(FilteredMessage, ServerCommandSource, RegistryKey) COMMENT @see #broadcast(FilteredMessage, ServerPlayerEntity, RegistryKey) COMMENT @see #broadcast(SignedMessage, MessageSender, RegistryKey) @@ -189,12 +190,13 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager COMMENT @apiNote This is used to send general messages such as a death COMMENT message or a join/leave message. COMMENT - COMMENT @see #broadcast(Text, Function, RegistryKey) + COMMENT @see #broadcast(Text, Function, boolean) COMMENT @see #broadcast(FilteredMessage, ServerCommandSource, RegistryKey) COMMENT @see #broadcast(FilteredMessage, ServerPlayerEntity, RegistryKey) COMMENT @see #broadcast(SignedMessage, MessageSender, RegistryKey) COMMENT @see #broadcast(SignedMessage, Function, MessageSender, RegistryKey) ARG 1 message + ARG 2 overlay METHOD method_43670 (Lnet/minecraft/class_3222;Lnet/minecraft/server/MinecraftServer$class_7460;)V ARG 1 properties METHOD method_43672 (Lnet/minecraft/class_7471;Lnet/minecraft/class_3222;)Lnet/minecraft/class_7471; @@ -206,7 +208,7 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager COMMENT {@link net.minecraft.network.message.MessageSignature#none} - to send a chat COMMENT message; however if the signature is invalid (e.g. because the text's content differs COMMENT from the one sent by the client, or because the passed signature is invalid) the client - COMMENT will log a warning. See {@link + COMMENT will show a warning and can discard it depending on the client's options. See {@link COMMENT net.minecraft.network.message.MessageSignature#updateSignature} for how the COMMENT message is signed. COMMENT @@ -215,8 +217,8 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager COMMENT as well as through commands like {@link net.minecraft.server.command.MeCommand} or COMMENT {@link net.minecraft.server.command.SayCommand} . COMMENT - COMMENT @see #broadcast(Text, RegistryKey) - COMMENT @see #broadcast(Text, Function, RegistryKey) + COMMENT @see #broadcast(Text, boolean) + COMMENT @see #broadcast(Text, Function, boolean) COMMENT @see #broadcast(FilteredMessage, ServerCommandSource, RegistryKey) COMMENT @see #broadcast(SignedMessage, MessageSender, RegistryKey) COMMENT @see #broadcast(SignedMessage, Function, MessageSender, RegistryKey) @@ -230,15 +232,15 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager COMMENT {@link net.minecraft.network.message.MessageSignature#none} - to send a chat COMMENT message; however if the signature is invalid (e.g. because the text's content differs COMMENT from the one sent by the client, or because the passed signature is invalid) the client - COMMENT will log a warning. See {@link + COMMENT will show a warning and can discard it depending on the client's options. See {@link COMMENT net.minecraft.network.message.MessageSignature#updateSignature} for how the COMMENT message is signed. COMMENT COMMENT @apiNote This method is used to broadcast messages from commands like {@link COMMENT net.minecraft.server.command.MeCommand} or {@link net.minecraft.server.command.SayCommand}. COMMENT - COMMENT @see #broadcast(Text, RegistryKey) - COMMENT @see #broadcast(Text, Function, RegistryKey) + COMMENT @see #broadcast(Text, boolean) + COMMENT @see #broadcast(Text, Function, boolean) COMMENT @see #broadcast(FilteredMessage, ServerCommandSource, RegistryKey) COMMENT @see #broadcast(FilteredMessage, ServerPlayerEntity, RegistryKey) COMMENT @see #broadcast(SignedMessage, Function, MessageSender, RegistryKey) @@ -254,8 +256,8 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager COMMENT {@link net.minecraft.server.command.MeCommand} or COMMENT {@link net.minecraft.server.command.SayCommand} . COMMENT - COMMENT @see #broadcast(Text, RegistryKey) - COMMENT @see #broadcast(Text, Function, RegistryKey) + COMMENT @see #broadcast(Text, boolean) + COMMENT @see #broadcast(Text, Function, boolean) COMMENT @see #broadcast(FilteredMessage, ServerPlayerEntity, RegistryKey) COMMENT @see #broadcast(SignedMessage, MessageSender, RegistryKey) COMMENT @see #broadcast(SignedMessage, Function, MessageSender, RegistryKey) diff --git a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping index 0be8ecbe5f..0db323fe16 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping @@ -214,6 +214,9 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity METHOD method_38786 tickFallStartPos ()V METHOD method_38787 tickVehicleInLavaRiding ()V METHOD method_39426 allowsServerListing ()Z + METHOD method_43502 sendMessageToClient (Lnet/minecraft/class_2561;Z)V + ARG 1 message + ARG 2 overlay METHOD method_43505 sendChatMessage (Lnet/minecraft/class_7471;Lnet/minecraft/class_7436;Lnet/minecraft/class_5321;)V COMMENT Sends a chat message to the player. COMMENT @@ -221,21 +224,26 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity COMMENT {@link net.minecraft.network.message.MessageSignature#none} - to send a chat COMMENT message; however if the signature is invalid (e.g. because the text's content differs COMMENT from the one sent by the client, or because the passed signature is invalid) the client - COMMENT will log a warning. See {@link + COMMENT will show a warning and can discard it depending on the client's options. See {@link COMMENT net.minecraft.network.message.MessageSignature#updateSignature} for how the COMMENT message is signed. COMMENT COMMENT @see #sendMessage(Text) - COMMENT @see #sendMessage(Text, RegistryKey) + COMMENT @see #sendMessage(Text, boolean) ARG 1 message ARG 2 sender ARG 3 typeKey METHOD method_43506 sendMessageDeliverError (Lnet/minecraft/class_2561;)V ARG 1 message + METHOD method_43507 (Lnet/minecraft/class_2561;Lio/netty/util/concurrent/Future;)V + ARG 2 future METHOD method_43666 getMessageTypeId (Lnet/minecraft/class_5321;)I ARG 1 typeKey METHOD method_43930 sendServerMetadata (Lnet/minecraft/class_2926;)V ARG 1 metadata + METHOD method_44706 acceptsChatMessage ()Z + METHOD method_44707 acceptsMessage (Z)Z + ARG 1 overlay METHOD method_7336 changeGameMode (Lnet/minecraft/class_1934;)Z ARG 1 gameMode CLASS 1 diff --git a/mappings/net/minecraft/text/StringVisitable.mapping b/mappings/net/minecraft/text/StringVisitable.mapping index 7f4a3b1159..157d649568 100644 --- a/mappings/net/minecraft/text/StringVisitable.mapping +++ b/mappings/net/minecraft/text/StringVisitable.mapping @@ -69,6 +69,5 @@ CLASS net/minecraft/class_5348 net/minecraft/text/StringVisitable COMMENT COMMENT @return {@code Optional.empty()} to continue, a non-empty result to terminate ARG 1 style - COMMENT the current style ARG 2 asString COMMENT the literal string diff --git a/mappings/net/minecraft/text/Text.mapping b/mappings/net/minecraft/text/Text.mapping index 7e391d3c98..dc2051dcbc 100644 --- a/mappings/net/minecraft/text/Text.mapping +++ b/mappings/net/minecraft/text/Text.mapping @@ -58,6 +58,10 @@ CLASS net/minecraft/class_2561 net/minecraft/text/Text METHOD method_43472 keybind (Ljava/lang/String;)Lnet/minecraft/class_5250; ARG 0 string METHOD method_43473 empty ()Lnet/minecraft/class_5250; + METHOD method_44745 contains (Lnet/minecraft/class_2561;)Z + COMMENT {@return whether the text contains {@code text}, without considering styles} + ARG 1 text + METHOD method_44746 withoutStyle ()Ljava/util/List; CLASS class_2562 Serializer COMMENT A JSON serializer for {@link Text}. FIELD field_11752 JSON_READER_LINE_START Ljava/lang/reflect/Field;