From 7b33eeee9acd33a879990d5473c588286e7124fe Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Wed, 22 Jun 2022 07:14:18 +0900 Subject: [PATCH] 1.19.1-pre1 abuse and ban (#3220) * 1.19.1-pre1 abuse/ban * Rename ConfirmChatLinkScreen etc --- .../minecraft/client/MinecraftClient.mapping | 4 ++ .../gui/screen/ConfirmChatLinkScreen.mapping | 16 -------- .../gui/screen/ConfirmLinkScreen.mapping | 39 +++++++++++++++++++ .../client/gui/screen/ConfirmScreen.mapping | 12 ++++-- .../gui/screen/RunningTaskScreen.mapping | 1 + .../client/gui/screen/WarningScreen.mapping | 6 +++ .../AbuseReportReasonScreen.mapping | 18 +++++++++ .../abusereport/ChatReportScreen.mapping | 4 ++ .../abusereport/ChatSelectionScreen.mapping | 7 ++++ .../SocialInteractionsPlayerListEntry.mapping | 2 + .../client/gui/widget/EntryListWidget.mapping | 2 + .../net/minecraft/client/network/Bans.mapping | 19 +++++++++ .../abusereport/AbuseReportReason.mapping | 6 +++ .../net/minecraft/screen/ScreenTexts.mapping | 7 ++++ 14 files changed, 123 insertions(+), 20 deletions(-) delete mode 100644 mappings/net/minecraft/client/gui/screen/ConfirmChatLinkScreen.mapping create mode 100644 mappings/net/minecraft/client/gui/screen/ConfirmLinkScreen.mapping create mode 100644 mappings/net/minecraft/client/network/Bans.mapping diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 91540b2de1..8101f81a0d 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -495,6 +495,10 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient COMMENT Recreates and resets {@link #abuseReporter} if {@code environment} has changed. ARG 1 environment METHOD method_44377 getAbuseReporter ()Lnet/minecraft/class_7574; + METHOD method_44647 getMultiplayerBanDetails ()Lcom/mojang/authlib/minecraft/BanDetails; + METHOD method_44648 (Z)V + ARG 1 confirmed + METHOD method_44649 isMultiplayerBanned ()Z CLASS class_5859 ChatRestriction COMMENT Represents the restrictions on chat on a Minecraft client. COMMENT diff --git a/mappings/net/minecraft/client/gui/screen/ConfirmChatLinkScreen.mapping b/mappings/net/minecraft/client/gui/screen/ConfirmChatLinkScreen.mapping deleted file mode 100644 index 989df1a5b0..0000000000 --- a/mappings/net/minecraft/client/gui/screen/ConfirmChatLinkScreen.mapping +++ /dev/null @@ -1,16 +0,0 @@ -CLASS net/minecraft/class_407 net/minecraft/client/gui/screen/ConfirmChatLinkScreen - FIELD field_2370 drawWarning Z - FIELD field_2371 link Ljava/lang/String; - FIELD field_2372 WARNING Lnet/minecraft/class_2561; - FIELD field_2373 COPY Lnet/minecraft/class_2561; - METHOD (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Ljava/lang/String;Z)V - ARG 1 callback - ARG 2 link - ARG 3 trusted - METHOD method_19795 (Lnet/minecraft/class_4185;)V - ARG 1 button - METHOD method_19796 (Lnet/minecraft/class_4185;)V - ARG 1 button - METHOD method_19797 (Lnet/minecraft/class_4185;)V - ARG 1 button - METHOD method_2100 copyToClipboard ()V diff --git a/mappings/net/minecraft/client/gui/screen/ConfirmLinkScreen.mapping b/mappings/net/minecraft/client/gui/screen/ConfirmLinkScreen.mapping new file mode 100644 index 0000000000..6a009bccb0 --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/ConfirmLinkScreen.mapping @@ -0,0 +1,39 @@ +CLASS net/minecraft/class_407 net/minecraft/client/gui/screen/ConfirmLinkScreen + FIELD field_2370 drawWarning Z + FIELD field_2371 link Ljava/lang/String; + FIELD field_2372 WARNING Lnet/minecraft/class_2561; + FIELD field_2373 COPY Lnet/minecraft/class_2561; + METHOD (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Ljava/lang/String;Z)V + ARG 1 callback + ARG 2 link + ARG 3 trusted + METHOD (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lnet/minecraft/class_2561;Ljava/lang/String;Lnet/minecraft/class_2561;Z)V + ARG 1 callback + ARG 2 title + ARG 3 link + ARG 4 noText + ARG 5 linkTrusted + METHOD (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lnet/minecraft/class_2561;Ljava/lang/String;Z)V + ARG 1 callback + ARG 2 title + ARG 3 link + ARG 4 linkTrusted + METHOD (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Ljava/lang/String;Lnet/minecraft/class_2561;Z)V + ARG 1 callback + ARG 2 title + ARG 3 message + ARG 4 link + ARG 5 noText + ARG 6 linkTrusted + METHOD method_19795 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_19796 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_19797 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_2100 copyToClipboard ()V + METHOD method_44658 getConfirmText (ZLjava/lang/String;)Lnet/minecraft/class_5250; + ARG 0 linkTrusted + ARG 1 link + METHOD method_44659 getConfirmText (Z)Lnet/minecraft/class_5250; + ARG 0 linkTrusted diff --git a/mappings/net/minecraft/client/gui/screen/ConfirmScreen.mapping b/mappings/net/minecraft/client/gui/screen/ConfirmScreen.mapping index a8d8757442..6b7a20846c 100644 --- a/mappings/net/minecraft/client/gui/screen/ConfirmScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ConfirmScreen.mapping @@ -1,11 +1,12 @@ CLASS net/minecraft/class_410 net/minecraft/client/gui/screen/ConfirmScreen - FIELD field_2399 noTranslated Lnet/minecraft/class_2561; + FIELD field_2399 noText Lnet/minecraft/class_2561; FIELD field_2400 buttonEnableTimer I FIELD field_2401 message Lnet/minecraft/class_2561; - FIELD field_2402 yesTranslated Lnet/minecraft/class_2561; + FIELD field_2402 yesText Lnet/minecraft/class_2561; FIELD field_2403 callback Lit/unimi/dsi/fastutil/booleans/BooleanConsumer; FIELD field_2404 messageSplit Lnet/minecraft/class_5489; FIELD field_33808 buttons Ljava/util/List; + FIELD field_39722 TITLE_BOTTOM_MARGIN I METHOD (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V ARG 1 callback ARG 2 title @@ -14,8 +15,8 @@ CLASS net/minecraft/class_410 net/minecraft/client/gui/screen/ConfirmScreen ARG 1 callback ARG 2 title ARG 3 message - ARG 4 yesTranslated - ARG 5 noTranslated + ARG 4 yesText + ARG 5 noText METHOD method_2125 disableButtons (I)V ARG 1 ticks METHOD method_37051 addButtons (I)V @@ -26,3 +27,6 @@ CLASS net/minecraft/class_410 net/minecraft/client/gui/screen/ConfirmScreen ARG 1 button METHOD method_37054 (Lnet/minecraft/class_4185;)V ARG 1 button + METHOD method_44660 getTitleY ()I + METHOD method_44661 getMessageY ()I + METHOD method_44662 getMessagesHeight ()I diff --git a/mappings/net/minecraft/client/gui/screen/RunningTaskScreen.mapping b/mappings/net/minecraft/client/gui/screen/RunningTaskScreen.mapping index ceb7b2a507..64e06441b6 100644 --- a/mappings/net/minecraft/client/gui/screen/RunningTaskScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/RunningTaskScreen.mapping @@ -28,3 +28,4 @@ CLASS net/minecraft/class_7534 net/minecraft/client/gui/screen/RunningTaskScreen COMMENT 1 second after calling this. ARG 1 description ARG 2 buttonText + ARG 3 buttonCallback diff --git a/mappings/net/minecraft/client/gui/screen/WarningScreen.mapping b/mappings/net/minecraft/client/gui/screen/WarningScreen.mapping index 11746a9172..71de58875e 100644 --- a/mappings/net/minecraft/client/gui/screen/WarningScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/WarningScreen.mapping @@ -4,6 +4,10 @@ CLASS net/minecraft/class_7065 net/minecraft/client/gui/screen/WarningScreen FIELD field_37220 checkMessage Lnet/minecraft/class_2561; FIELD field_37221 narratedText Lnet/minecraft/class_2561; FIELD field_37222 messageText Lnet/minecraft/class_5489; + METHOD (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V + ARG 1 header + ARG 2 message + ARG 3 narratedText METHOD (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V ARG 1 header ARG 2 message @@ -12,3 +16,5 @@ CLASS net/minecraft/class_7065 net/minecraft/client/gui/screen/WarningScreen METHOD method_41160 initButtons (I)V ARG 1 yOffset METHOD method_44068 getLineHeight ()I + METHOD method_44663 drawTitle (Lnet/minecraft/class_4587;)V + ARG 1 matrices diff --git a/mappings/net/minecraft/client/gui/screen/abusereport/AbuseReportReasonScreen.mapping b/mappings/net/minecraft/client/gui/screen/abusereport/AbuseReportReasonScreen.mapping index 0b016f2d82..76fcdcbcba 100644 --- a/mappings/net/minecraft/client/gui/screen/abusereport/AbuseReportReasonScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/abusereport/AbuseReportReasonScreen.mapping @@ -6,10 +6,28 @@ CLASS net/minecraft/class_7551 net/minecraft/client/gui/screen/abusereport/Abuse 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; + FIELD field_39730 COMMUNITY_STANDARDS_URL Ljava/lang/String; + FIELD field_39731 STANDARDS_TEXT Lnet/minecraft/class_2561; + FIELD field_39732 DONE_BUTTON_WIDTH I + FIELD field_39733 DONE_BUTTON_HEIGHT I + FIELD field_39734 SCREEN_WIDTH I + FIELD field_39735 TOP_MARGIN I METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_7573;Ljava/util/function/Consumer;)V ARG 1 parent ARG 2 reason ARG 3 reasonConsumer + METHOD method_44520 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_44668 getTop ()I + METHOD method_44669 getBottom ()I + METHOD method_44670 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_44672 (Z)V + ARG 1 confirmed + METHOD method_44673 getDoneButtonX ()I + METHOD method_44674 getDoneButtonY ()I + METHOD method_44675 getLeft ()I + METHOD method_44676 getRight ()I CLASS class_7552 ReasonListWidget METHOD (Lnet/minecraft/class_7551;Lnet/minecraft/class_310;)V ARG 2 client diff --git a/mappings/net/minecraft/client/gui/screen/abusereport/ChatReportScreen.mapping b/mappings/net/minecraft/client/gui/screen/abusereport/ChatReportScreen.mapping index 5fce2a2cb1..eaafea5381 100644 --- a/mappings/net/minecraft/client/gui/screen/abusereport/ChatReportScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/abusereport/ChatReportScreen.mapping @@ -61,6 +61,10 @@ CLASS net/minecraft/class_7538 net/minecraft/client/gui/screen/abusereport/ChatR METHOD method_44480 getWidgetsLeft ()I METHOD method_44481 getWidgetsRight ()I CLASS class_7539 DiscardWarningScreen + FIELD field_39723 TITLE Lnet/minecraft/class_2561; + FIELD field_39724 MESSAGE Lnet/minecraft/class_2561; + FIELD field_39725 RETURN_BUTTON_TEXT Lnet/minecraft/class_2561; + FIELD field_39726 DISCARD_BUTTON_TEXT Lnet/minecraft/class_2561; METHOD method_44482 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_44483 (Lnet/minecraft/class_4185;)V diff --git a/mappings/net/minecraft/client/gui/screen/abusereport/ChatSelectionScreen.mapping b/mappings/net/minecraft/client/gui/screen/abusereport/ChatSelectionScreen.mapping index 9b7dcbb434..9c5b642519 100644 --- a/mappings/net/minecraft/client/gui/screen/abusereport/ChatSelectionScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/abusereport/ChatSelectionScreen.mapping @@ -7,6 +7,9 @@ CLASS net/minecraft/class_7543 net/minecraft/client/gui/screen/abusereport/ChatS FIELD field_39589 newReportConsumer Ljava/util/function/Consumer; FIELD field_39590 listAdder Lnet/minecraft/class_7541; FIELD field_39591 tooltip Ljava/util/List; + FIELD field_39727 TITLE Lnet/minecraft/class_2561; + FIELD field_39728 CONTEXT_MESSAGE Lnet/minecraft/class_2561; + FIELD field_39729 contextMessage Lnet/minecraft/class_5489; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_7574;Lnet/minecraft/class_7566;Ljava/util/function/Consumer;)V ARG 1 parent ARG 2 reporter @@ -27,12 +30,14 @@ CLASS net/minecraft/class_7543 net/minecraft/client/gui/screen/abusereport/ChatS FIELD field_39593 lastSenderEntryPair Lnet/minecraft/class_7543$class_7544$class_7547; METHOD (Lnet/minecraft/class_7543;Lnet/minecraft/class_310;I)V ARG 2 client + ARG 3 contextMessagesHeight 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 + METHOD method_44665 getContextMessageY ()I CLASS class_7545 TextEntry FIELD field_39595 TEXT_COLOR I FIELD field_39596 text Lnet/minecraft/class_2561; @@ -59,6 +64,8 @@ CLASS net/minecraft/class_7543 net/minecraft/client/gui/screen/abusereport/ChatS ARG 5 fromReportedPlayer ARG 6 isChatMessage METHOD method_44517 toggle ()Z + METHOD method_44666 getTextWidth ()I + METHOD method_44667 getIndent ()I 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/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping index c979807699..ccf1eccb60 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping @@ -25,6 +25,8 @@ CLASS net/minecraft/class_5519 net/minecraft/client/gui/screen/multiplayer/Socia FIELD field_39622 reportButton Lnet/minecraft/class_4185; FIELD field_39623 reportText Lnet/minecraft/class_2561; FIELD field_39624 reportTooltip Ljava/util/List; + FIELD field_39736 REPORT_DISABLED_TEXT Lnet/minecraft/class_2561; + FIELD field_39737 REPORT_BUTTON_TEXTURE Lnet/minecraft/class_2960; 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 diff --git a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping index 1e761c624e..dc2d48c51e 100644 --- a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping @@ -142,6 +142,8 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget ARG 6 fillColor METHOD method_44399 addEntryToTop (Lnet/minecraft/class_350$class_351;)V ARG 1 entry + METHOD method_44650 removeEntryWithoutScrolling (Lnet/minecraft/class_350$class_351;)Z + 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/network/Bans.mapping b/mappings/net/minecraft/client/network/Bans.mapping new file mode 100644 index 0000000000..943ac58c97 --- /dev/null +++ b/mappings/net/minecraft/client/network/Bans.mapping @@ -0,0 +1,19 @@ +CLASS net/minecraft/class_7588 net/minecraft/client/network/Bans + FIELD field_39719 JAVA_MODERATION_URL Ljava/lang/String; + FIELD field_39720 TEMPORARY_TITLE Lnet/minecraft/class_2561; + FIELD field_39721 PERMANENT_TITLE Lnet/minecraft/class_2561; + METHOD method_44651 getTitle (Lcom/mojang/authlib/minecraft/BanDetails;)Lnet/minecraft/class_2561; + ARG 0 banDetails + METHOD method_44652 createBanScreen (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lcom/mojang/authlib/minecraft/BanDetails;)Lnet/minecraft/class_407; + ARG 0 callback + ARG 1 banDetails + METHOD method_44653 getDescriptionText (Lcom/mojang/authlib/minecraft/BanDetails;)Lnet/minecraft/class_2561; + ARG 0 banDetails + METHOD method_44654 getReasonText (Lcom/mojang/authlib/minecraft/BanDetails;)Lnet/minecraft/class_2561; + ARG 0 banDetails + METHOD method_44655 getDurationText (Lcom/mojang/authlib/minecraft/BanDetails;)Lnet/minecraft/class_2561; + ARG 0 banDetails + METHOD method_44656 getTemporaryBanDurationText (Lcom/mojang/authlib/minecraft/BanDetails;)Lnet/minecraft/class_2561; + ARG 0 banDetails + METHOD method_44657 isTemporary (Lcom/mojang/authlib/minecraft/BanDetails;)Z + ARG 0 banDetails diff --git a/mappings/net/minecraft/client/network/abusereport/AbuseReportReason.mapping b/mappings/net/minecraft/client/network/abusereport/AbuseReportReason.mapping index 9c78e7fbc6..848f859c5d 100644 --- a/mappings/net/minecraft/client/network/abusereport/AbuseReportReason.mapping +++ b/mappings/net/minecraft/client/network/abusereport/AbuseReportReason.mapping @@ -2,6 +2,12 @@ CLASS net/minecraft/class_7573 net/minecraft/client/network/abusereport/AbuseRep FIELD field_39671 id Ljava/lang/String; FIELD field_39672 text Lnet/minecraft/class_2561; FIELD field_39673 description Lnet/minecraft/class_2561; + FIELD field_39741 banReasonId I + METHOD (Ljava/lang/String;IILjava/lang/String;)V + ARG 3 banReasonId + ARG 4 id METHOD method_44594 getId ()Ljava/lang/String; METHOD method_44595 getText ()Lnet/minecraft/class_2561; METHOD method_44596 getDescription ()Lnet/minecraft/class_2561; + METHOD method_44681 getText (I)Lnet/minecraft/class_2561; + ARG 0 banReasonId diff --git a/mappings/net/minecraft/screen/ScreenTexts.mapping b/mappings/net/minecraft/screen/ScreenTexts.mapping index bd3c6f5479..ca40ed8b0f 100644 --- a/mappings/net/minecraft/screen/ScreenTexts.mapping +++ b/mappings/net/minecraft/screen/ScreenTexts.mapping @@ -12,6 +12,7 @@ CLASS net/minecraft/class_5244 net/minecraft/screen/ScreenTexts 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; + FIELD field_39742 ACKNOWLEDGE Lnet/minecraft/class_2561; METHOD method_30619 composeToggleText (Lnet/minecraft/class_2561;Z)Lnet/minecraft/class_5250; ARG 0 text ARG 1 value @@ -27,3 +28,9 @@ CLASS net/minecraft/class_5244 net/minecraft/screen/ScreenTexts METHOD method_37111 joinSentences (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)Lnet/minecraft/class_5250; ARG 0 first ARG 1 second + METHOD method_44682 days (J)Lnet/minecraft/class_5250; + ARG 0 days + METHOD method_44683 hours (J)Lnet/minecraft/class_5250; + ARG 0 hours + METHOD method_44684 minutes (J)Lnet/minecraft/class_5250; + ARG 0 minutes