From 318efc5beb8635746e0d1f40c37079b4694bc749 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Fri, 18 Aug 2023 03:25:06 +1000 Subject: [PATCH] 23w33a stuff --- mappings/net/minecraft/class_8768.mapping | 13 ----- .../minecraft/client/MinecraftClient.mapping | 20 ++++++++ .../net/minecraft/client/QuickPlay.mapping | 1 + .../minecraft/client/gui/hud/DebugHud.mapping | 24 +++++++++ .../client/gui/hud/InGameHud.mapping | 1 + .../AccessibilityOnboardingScreen.mapping | 3 ++ .../SocialInteractionsPlayerListEntry.mapping | 4 +- .../report/AbuseReportTypeScreen.mapping | 24 +++++++++ .../screen/report/ChatReportScreen.mapping | 14 ++++++ .../screen/report/ChatSelectionScreen.mapping | 4 +- .../gui/screen/report/ReportScreen.mapping | 49 +++++++++++++++++++ .../screen/report/SkinReportScreen.mapping | 37 ++++++++++++++ .../report/UsernameReportScreen.mapping | 32 ++++++++++++ .../client/gui/widget/ClickableWidget.mapping | 2 + .../client/gui/widget/LayoutWidgets.mapping | 13 +++++ .../gui/widget/PlayerSkinWidget.mapping | 16 ++++++ .../client/option/GameOptions.mapping | 2 + .../render/TexturedRenderLayers.mapping | 2 + .../client/report/AbuseReport.mapping | 41 ++++++++++++++++ .../client/report/AbuseReportSender.mapping | 2 + .../client/report/AbuseReportType.mapping | 5 ++ .../client/report/ChatAbuseReport.mapping | 15 ++++++ .../net/minecraft/client/report/Draft.mapping | 15 ------ .../client/report/SkinAbuseReport.mapping | 16 ++++++ .../client/report/UsernameAbuseReport.mapping | 16 ++++++ .../net/minecraft/client/util/Bans.mapping | 12 +++++ .../net/minecraft/entity/LivingEntity.mapping | 4 ++ .../minecraft/entity/mob/MobEntity.mapping | 5 ++ .../predicate/StatePredicate.mapping | 2 +- .../entity/VariantPredicates.mapping | 2 +- .../net/minecraft/screen/slot/Slot.mapping | 3 ++ .../minecraft/sound/BlockSoundGroup.mapping | 2 + .../net/minecraft/test/TestRunner.mapping | 1 + 33 files changed, 369 insertions(+), 33 deletions(-) delete mode 100644 mappings/net/minecraft/class_8768.mapping create mode 100644 mappings/net/minecraft/client/gui/screen/report/AbuseReportTypeScreen.mapping create mode 100644 mappings/net/minecraft/client/gui/screen/report/ReportScreen.mapping create mode 100644 mappings/net/minecraft/client/gui/screen/report/SkinReportScreen.mapping create mode 100644 mappings/net/minecraft/client/gui/screen/report/UsernameReportScreen.mapping create mode 100644 mappings/net/minecraft/client/gui/widget/LayoutWidgets.mapping create mode 100644 mappings/net/minecraft/client/gui/widget/PlayerSkinWidget.mapping create mode 100644 mappings/net/minecraft/client/report/AbuseReport.mapping create mode 100644 mappings/net/minecraft/client/report/AbuseReportType.mapping delete mode 100644 mappings/net/minecraft/client/report/Draft.mapping create mode 100644 mappings/net/minecraft/client/report/SkinAbuseReport.mapping create mode 100644 mappings/net/minecraft/client/report/UsernameAbuseReport.mapping diff --git a/mappings/net/minecraft/class_8768.mapping b/mappings/net/minecraft/class_8768.mapping deleted file mode 100644 index 71f4e1e20a..0000000000 --- a/mappings/net/minecraft/class_8768.mapping +++ /dev/null @@ -1,13 +0,0 @@ -CLASS net/minecraft/class_8768 - 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; - FIELD field_40794 DRAFT_BUTTON_TEXT Lnet/minecraft/class_2561; - METHOD method_44483 (Lnet/minecraft/class_4185;)V - ARG 1 button - METHOD method_46518 (Lnet/minecraft/class_4185;)V - ARG 1 button - METHOD method_46519 (Lnet/minecraft/class_4185;)V - ARG 1 button diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 66b723a280..61eedfee58 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -339,6 +339,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient ARG 1 mipmapLevels METHOD method_24226 handleResourceReloadException (Ljava/lang/Throwable;Lnet/minecraft/class_310$class_8764;)V ARG 1 throwable + ARG 2 loadingContext METHOD method_24287 getWindowTitle ()Ljava/lang/String; METHOD method_24288 updateWindowTitle ()V METHOD method_24289 getModStatus ()Lnet/minecraft/class_6683; @@ -377,6 +378,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_31186 onResourceReloadFailure (Ljava/lang/Throwable;Lnet/minecraft/class_2561;Lnet/minecraft/class_310$class_8764;)V ARG 1 exception ARG 2 resourceName + ARG 3 loadingContext METHOD method_31320 getSocialInteractionsManager ()Lnet/minecraft/class_5520; METHOD method_31321 isConnectedToServer ()Z METHOD method_31382 createUserApiService (Lcom/mojang/authlib/yggdrasil/YggdrasilAuthenticationService;Lnet/minecraft/class_542;)Lcom/mojang/authlib/minecraft/UserApiService; @@ -421,6 +423,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_35706 isRealmsEnabled ()Z METHOD method_36561 reloadResources (ZLnet/minecraft/class_310$class_8764;)Ljava/util/concurrent/CompletableFuture; ARG 1 force + ARG 2 loadingContext METHOD method_37274 addSystemDetailsToCrashReport (Lnet/minecraft/class_6396;Lnet/minecraft/class_310;Lnet/minecraft/class_1076;Ljava/lang/String;Lnet/minecraft/class_315;)Lnet/minecraft/class_6396; ARG 0 systemDetails ARG 1 client @@ -502,6 +505,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_49294 onForcedResourceReloadFailure ()V METHOD method_51253 getQuickPlayLogger ()Lnet/minecraft/class_8497; METHOD method_51736 collectLoadTimes (Lnet/minecraft/class_310$class_8764;)V + ARG 1 loadingContext METHOD method_52699 getGuiAtlasManager ()Lnet/minecraft/class_8658; METHOD method_52700 getCommandHistoryManager ()Lnet/minecraft/class_8657; METHOD method_52701 uuidEquals (Ljava/util/UUID;)Z @@ -511,7 +515,22 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient ARG 1 screen METHOD method_53462 getGameProfile ()Lcom/mojang/authlib/GameProfile; METHOD method_53465 onFinishedLoading (Lnet/minecraft/class_310$class_8764;)V + ARG 1 loadingContext METHOD method_53466 isFinishedLoading ()Z + METHOD method_53518 isUsernameBanned ()Z + METHOD method_53519 (Lcom/mojang/authlib/GameProfile;Ljava/lang/Runnable;)Lnet/minecraft/class_437; + ARG 1 onClose + METHOD method_53520 (Lcom/mojang/authlib/minecraft/BanDetails;Ljava/lang/Runnable;)Lnet/minecraft/class_437; + ARG 1 onClose + METHOD method_53523 (Ljava/lang/Runnable;)Lnet/minecraft/class_437; + ARG 1 onClose + METHOD method_53524 (Ljava/lang/Runnable;Z)V + ARG 1 confirmed + METHOD method_53525 createInitScreens (Ljava/util/List;)V + ARG 1 list + METHOD method_53526 getDebugHud ()Lnet/minecraft/class_340; + METHOD method_53527 onInitFinished (Lnet/minecraft/class_310$class_8764;)Ljava/lang/Runnable; + ARG 1 loadingContext CLASS class_5859 ChatRestriction COMMENT Represents the restrictions on chat on a Minecraft client. COMMENT @@ -523,3 +542,4 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_33885 getDescription ()Lnet/minecraft/class_2561; METHOD method_33886 allowsChat (Z)Z ARG 1 singlePlayer + CLASS class_8764 LoadingContext diff --git a/mappings/net/minecraft/client/QuickPlay.mapping b/mappings/net/minecraft/client/QuickPlay.mapping index 997096c7a6..44a826b637 100644 --- a/mappings/net/minecraft/client/QuickPlay.mapping +++ b/mappings/net/minecraft/client/QuickPlay.mapping @@ -15,6 +15,7 @@ CLASS net/minecraft/class_8496 net/minecraft/client/QuickPlay METHOD method_51260 startQuickPlay (Lnet/minecraft/class_310;Lnet/minecraft/class_542$class_8495;Lnet/minecraft/class_4341;)V ARG 0 client ARG 1 quickPlay + ARG 2 realmsClient METHOD method_51261 startSingleplayer (Lnet/minecraft/class_310;Ljava/lang/String;)V ARG 0 client ARG 1 levelName diff --git a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping index 98490bc671..21753b1606 100644 --- a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping @@ -13,6 +13,16 @@ CLASS net/minecraft/class_340 net/minecraft/client/gui/hud/DebugHud FIELD field_45911 pingChart Lnet/minecraft/class_8758; FIELD field_45912 packetSizeChart Lnet/minecraft/class_8756; FIELD field_45913 tickChart Lnet/minecraft/class_8759; + FIELD field_45988 showDebugHud Z + FIELD field_45989 renderingChartVisible Z + FIELD field_45990 renderingAndTickChartsVisible Z + FIELD field_45991 packetSizeAndPingChartsVisible Z + FIELD field_45992 frameNanosLog Lnet/minecraft/class_8743; + FIELD field_45993 tickNanosLog Lnet/minecraft/class_8743; + FIELD field_45994 pingLog Lnet/minecraft/class_8743; + FIELD field_45995 packetSizeLog Lnet/minecraft/class_8743; + METHOD (Lnet/minecraft/class_310;)V + ARG 1 client METHOD method_1834 getChunk ()Lnet/minecraft/class_2818; METHOD method_1835 getLeftText ()Ljava/util/List; METHOD method_1836 getClientChunk ()Lnet/minecraft/class_2818; @@ -57,6 +67,20 @@ CLASS net/minecraft/class_340 net/minecraft/client/gui/hud/DebugHud ARG 1 context ARG 2 text ARG 3 left + METHOD method_53534 pushToFrameLog (J)V + ARG 1 value + METHOD method_53535 pushToTickLog (J)V + ARG 1 value + METHOD method_53536 shouldShowDebugHud ()Z + METHOD method_53537 shouldShowRenderingChart ()Z + METHOD method_53538 showShowPacketSizeAndPingCharts ()Z + METHOD method_53539 toggleDebugHud ()V + METHOD method_53540 togglePacketSizeAndPingCharts ()V + METHOD method_53541 toggleRenderingAndTickCharts ()V + METHOD method_53542 toggleRenderingChart ()V + METHOD method_53543 getPingLog ()Lnet/minecraft/class_8743; + METHOD method_53544 getPacketSizeLog ()Lnet/minecraft/class_8743; + METHOD method_53545 clear ()V CLASS class_7412 AllocationRateCalculator FIELD field_38986 INTERVAL I FIELD field_38987 GARBAGE_COLLECTORS Ljava/util/List; diff --git a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping index fc7bb2321a..06b802ed83 100644 --- a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping @@ -197,6 +197,7 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud METHOD method_44353 shouldShowChatDisabledScreen ()Z METHOD method_44354 setCanShowChatDisabledScreen (Z)V ARG 1 canShowChatDisabledScreen + METHOD method_53531 getDebugHud ()Lnet/minecraft/class_340; CLASS class_6411 HeartType FIELD field_33946 POISONED Lnet/minecraft/class_329$class_6411; FIELD field_45329 fullTexture Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/client/gui/screen/AccessibilityOnboardingScreen.mapping b/mappings/net/minecraft/client/gui/screen/AccessibilityOnboardingScreen.mapping index 7a18d20d88..cd276f4270 100644 --- a/mappings/net/minecraft/client/gui/screen/AccessibilityOnboardingScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/AccessibilityOnboardingScreen.mapping @@ -7,8 +7,10 @@ CLASS net/minecraft/class_8032 net/minecraft/client/gui/screen/AccessibilityOnbo FIELD field_41844 narratorPromptTimer F FIELD field_41845 textWidget Lnet/minecraft/class_8019; FIELD field_42038 isNarratorUsable Z + FIELD field_46008 onClose Ljava/lang/Runnable; METHOD (Lnet/minecraft/class_315;Ljava/lang/Runnable;)V ARG 1 gameOptions + ARG 2 onClose METHOD method_48259 yMargin ()I METHOD method_48260 tickNarratorPrompt ()V METHOD method_48639 (Lnet/minecraft/class_4185;)V @@ -21,3 +23,4 @@ CLASS net/minecraft/class_8032 net/minecraft/client/gui/screen/AccessibilityOnbo ARG 1 button METHOD method_52746 (Lnet/minecraft/class_7847;)V ARG 0 positioner + METHOD method_53552 saveAndRun (Ljava/lang/Runnable;)V diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping index df617168d8..b29e63b779 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping @@ -12,7 +12,7 @@ CLASS net/minecraft/class_5519 net/minecraft/client/gui/screen/multiplayer/Socia FIELD field_26861 showButton Lnet/minecraft/class_4185; FIELD field_26864 timeCounter F FIELD field_26903 LIGHT_GRAY_COLOR I - FIELD field_26904 skinTexture Ljava/util/function/Supplier; + FIELD field_26904 skinSupplier Ljava/util/function/Supplier; FIELD field_26905 HIDDEN_TEXT Lnet/minecraft/class_2561; FIELD field_26906 BLOCKED_TEXT Lnet/minecraft/class_2561; FIELD field_26907 OFFLINE_TEXT Lnet/minecraft/class_2561; @@ -61,3 +61,5 @@ CLASS net/minecraft/class_5519 net/minecraft/client/gui/screen/multiplayer/Socia METHOD method_47634 getReportButtonTooltip ()Lnet/minecraft/class_7919; METHOD method_47905 setShowButtonVisible (Z)V ARG 1 showButtonVisible + METHOD method_53594 getSkinSupplier ()Ljava/util/function/Supplier; + METHOD method_53595 isReportable ()Z diff --git a/mappings/net/minecraft/client/gui/screen/report/AbuseReportTypeScreen.mapping b/mappings/net/minecraft/client/gui/screen/report/AbuseReportTypeScreen.mapping new file mode 100644 index 0000000000..93661b8756 --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/report/AbuseReportTypeScreen.mapping @@ -0,0 +1,24 @@ +CLASS net/minecraft/class_8770 net/minecraft/client/gui/screen/report/AbuseReportTypeScreen + FIELD field_46041 TITLE_TEXT Lnet/minecraft/class_2561; + FIELD field_46042 MESSAGE_TEXT Lnet/minecraft/class_2561; + FIELD field_46043 CHAT_TYPE_TEXT Lnet/minecraft/class_2561; + FIELD field_46044 SKIN_TYPE_TEXT Lnet/minecraft/class_2561; + FIELD field_46045 NAME_TYPE_TEXT Lnet/minecraft/class_2561; + FIELD field_46047 parent Lnet/minecraft/class_437; + FIELD field_46048 context Lnet/minecraft/class_7574; + FIELD field_46049 selectedPlayer Lnet/minecraft/class_5519; + FIELD field_46050 layout Lnet/minecraft/class_8667; + METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_7574;Lnet/minecraft/class_5519;)V + ARG 1 parent + ARG 2 context + ARG 3 selectedPlayer + METHOD method_53581 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_53582 (Lnet/minecraft/class_8770;Lnet/minecraft/class_364;)V + ARG 1 child + METHOD method_53583 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_53584 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_53585 (Lnet/minecraft/class_4185;)V + ARG 1 button diff --git a/mappings/net/minecraft/client/gui/screen/report/ChatReportScreen.mapping b/mappings/net/minecraft/client/gui/screen/report/ChatReportScreen.mapping index b556cba48b..10a7723796 100644 --- a/mappings/net/minecraft/client/gui/screen/report/ChatReportScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/report/ChatReportScreen.mapping @@ -2,17 +2,27 @@ CLASS net/minecraft/class_7538 net/minecraft/client/gui/screen/report/ChatReport FIELD field_39559 sendButton Lnet/minecraft/class_4185; FIELD field_39562 BOTTOM_BUTTON_WIDTH I FIELD field_39574 SELECT_CHAT_TEXT Lnet/minecraft/class_2561; + FIELD field_46031 TITLE_TEXT Lnet/minecraft/class_2561; + FIELD field_46032 layout Lnet/minecraft/class_8667; + FIELD field_46033 commentsBox Lnet/minecraft/class_7529; + FIELD field_46034 selectChatButton Lnet/minecraft/class_4185; + FIELD field_46035 selectReasonButton Lnet/minecraft/class_4185; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_7574;Ljava/util/UUID;)V ARG 1 parent ARG 2 reporter ARG 3 reportedPlayerUuid METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_7574;Lnet/minecraft/class_7566$class_8772;)V + ARG 1 parent ARG 2 context + ARG 3 reportBuilder METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_7574;Lnet/minecraft/class_7566;)V ARG 1 parent ARG 2 context + ARG 3 report METHOD method_44465 (Lnet/minecraft/class_4185;)V ARG 1 button + METHOD method_44471 (Lnet/minecraft/class_7566$class_8772;)V + ARG 1 updatedReportBuilder METHOD method_44472 (Lnet/minecraft/class_7573;)V ARG 1 reason METHOD method_44473 (Ljava/lang/String;)V @@ -24,3 +34,7 @@ CLASS net/minecraft/class_7538 net/minecraft/client/gui/screen/report/ChatReport METHOD method_44477 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_44478 onChange ()V + METHOD method_53572 (Lnet/minecraft/class_7847;)V + ARG 0 positioner + METHOD method_53573 (Lnet/minecraft/class_7538;Lnet/minecraft/class_364;)V + ARG 1 child diff --git a/mappings/net/minecraft/client/gui/screen/report/ChatSelectionScreen.mapping b/mappings/net/minecraft/client/gui/screen/report/ChatSelectionScreen.mapping index 63409c5ad9..7718bd9eb3 100644 --- a/mappings/net/minecraft/client/gui/screen/report/ChatSelectionScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/report/ChatSelectionScreen.mapping @@ -6,8 +6,8 @@ CLASS net/minecraft/class_7543 net/minecraft/client/gui/screen/report/ChatSelect FIELD field_39588 report Lnet/minecraft/class_7566$class_8772; FIELD field_39589 newReportConsumer Ljava/util/function/Consumer; FIELD field_39590 listAdder Lnet/minecraft/class_7541; - FIELD field_39727 TITLE Lnet/minecraft/class_2561; - FIELD field_39728 CONTEXT_MESSAGE Lnet/minecraft/class_2561; + FIELD field_39727 TITLE_TEXT Lnet/minecraft/class_2561; + FIELD field_39728 CONTEXT_TEXT Lnet/minecraft/class_2561; FIELD field_39729 contextMessage Lnet/minecraft/class_5489; FIELD field_45559 CHECKMARK_ICON_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_7574;Lnet/minecraft/class_7566$class_8772;Ljava/util/function/Consumer;)V diff --git a/mappings/net/minecraft/client/gui/screen/report/ReportScreen.mapping b/mappings/net/minecraft/client/gui/screen/report/ReportScreen.mapping new file mode 100644 index 0000000000..a4a0824e0e --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/report/ReportScreen.mapping @@ -0,0 +1,49 @@ +CLASS net/minecraft/class_8768 net/minecraft/client/gui/screen/report/ReportScreen + FIELD field_46012 SEND_TEXT Lnet/minecraft/class_2561; + FIELD field_46013 OBSERVED_WHAT_TEXT Lnet/minecraft/class_2561; + FIELD field_46014 SELECT_REASON_TEXT Lnet/minecraft/class_2561; + FIELD field_46015 MORE_COMMENTS_TEXT Lnet/minecraft/class_2561; + FIELD field_46019 parent Lnet/minecraft/class_437; + FIELD field_46020 context Lnet/minecraft/class_7574; + FIELD field_46021 reportBuilder Lnet/minecraft/class_7855$class_8775; + FIELD field_46022 REPORT_SENT_MESSAGE_TEXT Lnet/minecraft/class_2561; + FIELD field_46023 SENDING_TITLE_TEXT Lnet/minecraft/class_2561; + FIELD field_46024 SENT_TITLE_TEXT Lnet/minecraft/class_2561; + FIELD field_46025 ERROR_TITLE_TEXT Lnet/minecraft/class_2561; + FIELD field_46026 GENERIC_ERROR_TEXT Lnet/minecraft/class_2561; + FIELD field_46027 DESCRIBE_TEXT Lnet/minecraft/class_2561; + FIELD field_46028 COMMENTS_TEXT Lnet/minecraft/class_2561; + FIELD field_46029 LOGGER Lorg/slf4j/Logger; + METHOD (Lnet/minecraft/class_2561;Lnet/minecraft/class_437;Lnet/minecraft/class_7574;Lnet/minecraft/class_7855$class_8775;)V + ARG 1 title + ARG 2 parent + ARG 3 context + ARG 4 reportBuilder + METHOD method_53559 onSent ()V + METHOD method_53560 saveDraft ()V + METHOD method_53561 resetDraft ()V + METHOD method_53564 createCommentsBox (IILjava/util/function/Consumer;)Lnet/minecraft/class_7529; + ARG 1 width + ARG 2 height + ARG 3 changeListener + METHOD method_53565 (Lnet/minecraft/class_7855$class_7567;)V + ARG 1 validationError + METHOD method_53566 (Lnet/minecraft/class_7855$class_7568;)V + ARG 1 reportWithId + METHOD method_53568 onSendError (Ljava/lang/Throwable;)V + ARG 1 error + METHOD method_53570 showError (Lnet/minecraft/class_2561;)V + ARG 1 errorMessage + METHOD method_53571 trySend ()V + 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; + FIELD field_40794 DRAFT_BUTTON_TEXT Lnet/minecraft/class_2561; + METHOD method_44483 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_46518 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_46519 (Lnet/minecraft/class_4185;)V + ARG 1 button diff --git a/mappings/net/minecraft/client/gui/screen/report/SkinReportScreen.mapping b/mappings/net/minecraft/client/gui/screen/report/SkinReportScreen.mapping new file mode 100644 index 0000000000..cab4ae8f2c --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/report/SkinReportScreen.mapping @@ -0,0 +1,37 @@ +CLASS net/minecraft/class_8771 net/minecraft/client/gui/screen/report/SkinReportScreen + FIELD field_46051 BOTTOM_BUTTON_WIDTH I + FIELD field_46052 SKIN_WIDGET_WIDTH I + FIELD field_46053 REASON_BUTTON_AND_COMMENTS_BOX_WIDTH I + FIELD field_46054 TITLE_TEXT Lnet/minecraft/class_2561; + FIELD field_46055 layout Lnet/minecraft/class_8667; + FIELD field_46056 commentsBox Lnet/minecraft/class_7529; + FIELD field_46057 sendButton Lnet/minecraft/class_4185; + FIELD field_46058 selectReasonButton Lnet/minecraft/class_4185; + METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_7574;Ljava/util/UUID;Ljava/util/function/Supplier;)V + ARG 1 parent + ARG 2 context + ARG 3 reportedPlayerUuid + ARG 4 skinSupplier + METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_7574;Lnet/minecraft/class_8777$class_8778;)V + ARG 1 parent + ARG 2 context + ARG 3 reportBuilder + METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_7574;Lnet/minecraft/class_8777;)V + ARG 1 parent + ARG 2 context + ARG 3 report + METHOD method_53586 onChange ()V + METHOD method_53587 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_53588 (Lnet/minecraft/class_7847;)V + ARG 0 positioner + METHOD method_53589 (Lnet/minecraft/class_8771;Lnet/minecraft/class_364;)V + ARG 1 child + METHOD method_53590 (Lnet/minecraft/class_7573;)V + ARG 1 reason + METHOD method_53591 (Ljava/lang/String;)V + ARG 1 opinionComments + METHOD method_53592 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_53593 (Lnet/minecraft/class_4185;)V + ARG 1 button diff --git a/mappings/net/minecraft/client/gui/screen/report/UsernameReportScreen.mapping b/mappings/net/minecraft/client/gui/screen/report/UsernameReportScreen.mapping new file mode 100644 index 0000000000..023ac9282c --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/report/UsernameReportScreen.mapping @@ -0,0 +1,32 @@ +CLASS net/minecraft/class_8769 net/minecraft/client/gui/screen/report/UsernameReportScreen + FIELD field_46036 BOTTOM_BUTTON_WIDTH I + FIELD field_46037 TITLE_TEXT Lnet/minecraft/class_2561; + FIELD field_46038 layout Lnet/minecraft/class_8667; + FIELD field_46039 commentsBox Lnet/minecraft/class_7529; + FIELD field_46040 sendButton Lnet/minecraft/class_4185; + METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_7574;Ljava/util/UUID;Ljava/lang/String;)V + ARG 1 parent + ARG 2 context + ARG 3 reportedPlayerUuid + ARG 4 username + METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_7574;Lnet/minecraft/class_8773$class_8774;)V + ARG 1 parent + ARG 2 context + ARG 3 reportBuilder + METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_7574;Lnet/minecraft/class_8773;)V + ARG 1 parent + ARG 2 context + ARG 3 report + METHOD method_53574 onChange ()V + METHOD method_53575 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_53576 (Lnet/minecraft/class_7847;)V + ARG 0 positioner + METHOD method_53577 (Lnet/minecraft/class_8769;Lnet/minecraft/class_364;)V + ARG 1 child + METHOD method_53578 (Ljava/lang/String;)V + ARG 1 opinionComments + METHOD method_53579 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_53580 (Lnet/minecraft/class_7847;)V + ARG 0 positioner diff --git a/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping b/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping index c465318d1e..1c305adf2d 100644 --- a/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping @@ -101,3 +101,5 @@ CLASS net/minecraft/class_339 net/minecraft/client/gui/widget/ClickableWidget ARG 5 endX ARG 6 endY ARG 7 color + METHOD method_53533 setHeight (I)V + ARG 1 height diff --git a/mappings/net/minecraft/client/gui/widget/LayoutWidgets.mapping b/mappings/net/minecraft/client/gui/widget/LayoutWidgets.mapping new file mode 100644 index 0000000000..2a0f889590 --- /dev/null +++ b/mappings/net/minecraft/client/gui/widget/LayoutWidgets.mapping @@ -0,0 +1,13 @@ +CLASS net/minecraft/class_8767 net/minecraft/client/gui/widget/LayoutWidgets + FIELD field_46007 SPACING I + METHOD method_53549 createLabeledWidget (Lnet/minecraft/class_327;Lnet/minecraft/class_8021;Lnet/minecraft/class_2561;)Lnet/minecraft/class_8133; + ARG 0 textRenderer + ARG 1 widget + ARG 2 label + METHOD method_53550 createLabeledWidget (Lnet/minecraft/class_327;Lnet/minecraft/class_8021;Lnet/minecraft/class_2561;Ljava/util/function/Consumer;)Lnet/minecraft/class_8133; + ARG 0 textRenderer + ARG 1 widget + ARG 2 label + ARG 3 callback + METHOD method_53551 (Lnet/minecraft/class_7847;)V + ARG 0 positioner diff --git a/mappings/net/minecraft/client/gui/widget/PlayerSkinWidget.mapping b/mappings/net/minecraft/client/gui/widget/PlayerSkinWidget.mapping new file mode 100644 index 0000000000..61fb9fa4d1 --- /dev/null +++ b/mappings/net/minecraft/client/gui/widget/PlayerSkinWidget.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/class_8765 net/minecraft/client/gui/widget/PlayerSkinWidget + FIELD field_46003 models Lnet/minecraft/class_8765$class_8766; + FIELD field_46004 skinSupplier Ljava/util/function/Supplier; + FIELD field_46005 xRotation F + FIELD field_46006 yRotation F + METHOD (IILnet/minecraft/class_5599;Ljava/util/function/Supplier;)V + ARG 1 width + ARG 2 height + ARG 3 entityModelLoader + ARG 4 skinSupplier + CLASS class_8766 Models + METHOD method_53547 draw (Lnet/minecraft/class_332;Lnet/minecraft/class_8685;)V + ARG 1 context + ARG 2 skinTextures + METHOD method_53548 create (Lnet/minecraft/class_5599;)Lnet/minecraft/class_8765$class_8766; + ARG 0 entityModelLoader diff --git a/mappings/net/minecraft/client/option/GameOptions.mapping b/mappings/net/minecraft/client/option/GameOptions.mapping index a463466459..973564b68e 100644 --- a/mappings/net/minecraft/client/option/GameOptions.mapping +++ b/mappings/net/minecraft/client/option/GameOptions.mapping @@ -219,6 +219,7 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions FIELD field_43043 HIGH_CONTRAST_TOOLTIP Lnet/minecraft/class_2561; FIELD field_43044 highContrast Lnet/minecraft/class_7172; FIELD field_43110 MAX_SERIALIZABLE_GUI_SCALE I + FIELD field_45987 narratorHotkey Lnet/minecraft/class_7172; METHOD (Lnet/minecraft/class_310;Ljava/io/File;)V ARG 1 client ARG 2 optionsFile @@ -591,6 +592,7 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions METHOD method_49600 getHighContrast ()Lnet/minecraft/class_7172; METHOD method_52704 (Ljava/lang/Boolean;)Lnet/minecraft/class_4063; ARG 0 value + METHOD method_53530 isNarratorHotkeyEnabled ()Lnet/minecraft/class_7172; CLASS 2 METHOD method_33676 find (Ljava/lang/String;)Ljava/lang/String; ARG 1 key diff --git a/mappings/net/minecraft/client/render/TexturedRenderLayers.mapping b/mappings/net/minecraft/client/render/TexturedRenderLayers.mapping index e015593cd4..e508a53b58 100644 --- a/mappings/net/minecraft/client/render/TexturedRenderLayers.mapping +++ b/mappings/net/minecraft/client/render/TexturedRenderLayers.mapping @@ -26,6 +26,7 @@ CLASS net/minecraft/class_4722 net/minecraft/client/render/TexturedRenderLayers FIELD field_42071 ARMOR_TRIMS_ATLAS_TEXTURE Lnet/minecraft/class_2960; FIELD field_42910 DECORATED_POT_ATLAS_TEXTURE Lnet/minecraft/class_2960; FIELD field_42911 DECORATED_POT_PATTERN_TEXTURES Ljava/util/Map; + FIELD field_46070 ARMOR_TRIMS_DECAL_RENDER_LAYER Lnet/minecraft/class_1921; METHOD method_24059 getBannerPatterns ()Lnet/minecraft/class_1921; METHOD method_24061 (Lnet/minecraft/class_1767;)Lnet/minecraft/class_4730; ARG 0 color @@ -71,6 +72,7 @@ CLASS net/minecraft/class_4722 net/minecraft/client/render/TexturedRenderLayers ARG 0 type METHOD method_45783 getHangingSign ()Lnet/minecraft/class_1921; METHOD method_48480 getArmorTrims (Z)Lnet/minecraft/class_1921; + ARG 0 decal METHOD method_49341 getDecoratedPotPatternTextureId (Lnet/minecraft/class_5321;)Lnet/minecraft/class_4730; ARG 0 potPatternKey METHOD method_49342 createDecoratedPotPatternTextureId (Lnet/minecraft/class_5321;)Lnet/minecraft/class_4730; diff --git a/mappings/net/minecraft/client/report/AbuseReport.mapping b/mappings/net/minecraft/client/report/AbuseReport.mapping new file mode 100644 index 0000000000..b83c17f974 --- /dev/null +++ b/mappings/net/minecraft/client/report/AbuseReport.mapping @@ -0,0 +1,41 @@ +CLASS net/minecraft/class_7855 net/minecraft/client/report/AbuseReport + FIELD field_40813 reportId Ljava/util/UUID; + FIELD field_40814 currentTime Ljava/time/Instant; + FIELD field_40815 reportedPlayerUuid Ljava/util/UUID; + FIELD field_40817 opinionComments Ljava/lang/String; + FIELD field_40818 reason Lnet/minecraft/class_7573; + METHOD (Ljava/util/UUID;Ljava/time/Instant;Ljava/util/UUID;)V + ARG 1 reportId + ARG 2 currentTime + ARG 3 reportedPlayerUuid + METHOD method_46547 copy ()Lnet/minecraft/class_7855; + METHOD method_46549 playerUuidEquals (Ljava/util/UUID;)Z + ARG 1 uuid + METHOD method_53596 createReportScreen (Lnet/minecraft/class_437;Lnet/minecraft/class_7574;)Lnet/minecraft/class_437; + ARG 1 parent + ARG 2 context + CLASS class_7567 ValidationError + FIELD field_39655 NO_REASON Lnet/minecraft/class_7855$class_7567; + FIELD field_39656 NO_REPORTED_MESSAGES Lnet/minecraft/class_7855$class_7567; + FIELD field_39657 TOO_MANY_MESSAGES Lnet/minecraft/class_7855$class_7567; + FIELD field_39658 COMMENTS_TOO_LONG Lnet/minecraft/class_7855$class_7567; + METHOD method_53615 createTooltip ()Lnet/minecraft/class_7919; + CLASS class_7568 ReportWithId + CLASS class_8775 Builder + FIELD field_46061 report Lnet/minecraft/class_7855; + FIELD field_46062 limits Lcom/mojang/authlib/minecraft/report/AbuseReportLimits; + METHOD (Lnet/minecraft/class_7855;Lcom/mojang/authlib/minecraft/report/AbuseReportLimits;)V + ARG 1 report + ARG 2 limits + METHOD method_53600 build (Lnet/minecraft/class_7574;)Lcom/mojang/datafixers/util/Either; + ARG 1 context + METHOD method_53602 hasEnoughInfo ()Z + METHOD method_53605 validate ()Lnet/minecraft/class_7855$class_7567; + METHOD method_53609 setReason (Lnet/minecraft/class_7573;)V + ARG 1 reason + METHOD method_53610 setOpinionComments (Ljava/lang/String;)V + ARG 1 opinionComments + METHOD method_53611 getReport ()Lnet/minecraft/class_7855; + METHOD method_53612 getReportedPlayerUuid ()Ljava/util/UUID; + METHOD method_53613 getOpinionComments ()Ljava/lang/String; + METHOD method_53614 getReason ()Lnet/minecraft/class_7573; diff --git a/mappings/net/minecraft/client/report/AbuseReportSender.mapping b/mappings/net/minecraft/client/report/AbuseReportSender.mapping index 85f17e08f4..fbcf778612 100644 --- a/mappings/net/minecraft/client/report/AbuseReportSender.mapping +++ b/mappings/net/minecraft/client/report/AbuseReportSender.mapping @@ -5,6 +5,8 @@ CLASS net/minecraft/class_7563 net/minecraft/client/report/AbuseReportSender ARG 1 userApiService METHOD method_44563 send (Ljava/util/UUID;Lnet/minecraft/class_8776;Lcom/mojang/authlib/minecraft/report/AbuseReport;)Ljava/util/concurrent/CompletableFuture; ARG 1 id + ARG 2 type + ARG 3 report METHOD method_44564 getLimits ()Lcom/mojang/authlib/minecraft/report/AbuseReportLimits; CLASS class_7564 AbuseReportException CLASS class_7565 Impl diff --git a/mappings/net/minecraft/client/report/AbuseReportType.mapping b/mappings/net/minecraft/client/report/AbuseReportType.mapping new file mode 100644 index 0000000000..d8e8b8d88f --- /dev/null +++ b/mappings/net/minecraft/client/report/AbuseReportType.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_8776 net/minecraft/client/report/AbuseReportType + FIELD field_46067 name Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 name + METHOD method_53616 getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/client/report/ChatAbuseReport.mapping b/mappings/net/minecraft/client/report/ChatAbuseReport.mapping index c4363aaedc..b703251a66 100644 --- a/mappings/net/minecraft/client/report/ChatAbuseReport.mapping +++ b/mappings/net/minecraft/client/report/ChatAbuseReport.mapping @@ -1,4 +1,19 @@ CLASS net/minecraft/class_7566 net/minecraft/client/report/ChatAbuseReport + FIELD field_46059 selectedMessages Lit/unimi/dsi/fastutil/ints/IntSet; METHOD method_44569 toggleMessageSelection (ILcom/mojang/authlib/minecraft/report/AbuseReportLimits;)V ARG 1 index + ARG 2 limits METHOD method_44585 copy ()Lnet/minecraft/class_7566; + CLASS class_8772 Builder + METHOD (Ljava/util/UUID;Lcom/mojang/authlib/minecraft/report/AbuseReportLimits;)V + ARG 1 reportedPlayerUuid + ARG 2 limits + METHOD (Lnet/minecraft/class_7566;Lcom/mojang/authlib/minecraft/report/AbuseReportLimits;)V + ARG 1 report + ARG 2 limits + METHOD method_53597 getSelectedMessages ()Lit/unimi/dsi/fastutil/ints/IntSet; + METHOD method_53598 toggleMessageSelection (I)V + ARG 1 index + METHOD method_53603 isMessageSelected (I)Z + ARG 1 index + METHOD method_53606 copy ()Lnet/minecraft/class_7566$class_8772; diff --git a/mappings/net/minecraft/client/report/Draft.mapping b/mappings/net/minecraft/client/report/Draft.mapping deleted file mode 100644 index 9db6e464e7..0000000000 --- a/mappings/net/minecraft/client/report/Draft.mapping +++ /dev/null @@ -1,15 +0,0 @@ -CLASS net/minecraft/class_7855 net/minecraft/client/report/Draft - FIELD field_40813 reportId Ljava/util/UUID; - FIELD field_40814 currentTime Ljava/time/Instant; - FIELD field_40815 reportedPlayerUuid Ljava/util/UUID; - FIELD field_40817 opinionComments Ljava/lang/String; - FIELD field_40818 reason Lnet/minecraft/class_7573; - METHOD method_46547 copy ()Lnet/minecraft/class_7855; - METHOD method_46549 playerUuidEquals (Ljava/util/UUID;)Z - ARG 1 uuid - CLASS class_7567 ValidationError - FIELD field_39655 NO_REASON Lnet/minecraft/class_7855$class_7567; - FIELD field_39656 NO_REPORTED_MESSAGES Lnet/minecraft/class_7855$class_7567; - FIELD field_39657 TOO_MANY_MESSAGES Lnet/minecraft/class_7855$class_7567; - FIELD field_39658 COMMENTS_TOO_LONG Lnet/minecraft/class_7855$class_7567; - CLASS class_7568 ReportWithId diff --git a/mappings/net/minecraft/client/report/SkinAbuseReport.mapping b/mappings/net/minecraft/client/report/SkinAbuseReport.mapping new file mode 100644 index 0000000000..ec6a2da280 --- /dev/null +++ b/mappings/net/minecraft/client/report/SkinAbuseReport.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/class_8777 net/minecraft/client/report/SkinAbuseReport + FIELD field_46069 skinSupplier Ljava/util/function/Supplier; + METHOD (Ljava/util/UUID;Ljava/time/Instant;Ljava/util/UUID;Ljava/util/function/Supplier;)V + ARG 1 reportId + ARG 2 currentTime + ARG 3 reportedPlayerUuid + ARG 4 skinSupplier + METHOD method_53618 getSkinSupplier ()Ljava/util/function/Supplier; + CLASS class_8778 Builder + METHOD (Ljava/util/UUID;Ljava/util/function/Supplier;Lcom/mojang/authlib/minecraft/report/AbuseReportLimits;)V + ARG 1 reportedPlayerUuid + ARG 2 skinSupplier + ARG 3 limits + METHOD (Lnet/minecraft/class_8777;Lcom/mojang/authlib/minecraft/report/AbuseReportLimits;)V + ARG 1 report + ARG 2 limits diff --git a/mappings/net/minecraft/client/report/UsernameAbuseReport.mapping b/mappings/net/minecraft/client/report/UsernameAbuseReport.mapping new file mode 100644 index 0000000000..95d92d2bcb --- /dev/null +++ b/mappings/net/minecraft/client/report/UsernameAbuseReport.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/class_8773 net/minecraft/client/report/UsernameAbuseReport + FIELD field_46060 username Ljava/lang/String; + METHOD (Ljava/util/UUID;Ljava/time/Instant;Ljava/util/UUID;Ljava/lang/String;)V + ARG 1 reportId + ARG 2 currentTime + ARG 3 reportedPlayerUuid + ARG 4 username + METHOD method_53607 getUsername ()Ljava/lang/String; + CLASS class_8774 Builder + METHOD (Ljava/util/UUID;Ljava/lang/String;Lcom/mojang/authlib/minecraft/report/AbuseReportLimits;)V + ARG 1 reportedPlayerUuid + ARG 2 username + ARG 3 limits + METHOD (Lnet/minecraft/class_8773;Lcom/mojang/authlib/minecraft/report/AbuseReportLimits;)V + ARG 1 report + ARG 2 limits diff --git a/mappings/net/minecraft/client/util/Bans.mapping b/mappings/net/minecraft/client/util/Bans.mapping index 4f0b2ec097..32c708dfdc 100644 --- a/mappings/net/minecraft/client/util/Bans.mapping +++ b/mappings/net/minecraft/client/util/Bans.mapping @@ -1,6 +1,9 @@ CLASS net/minecraft/class_7588 net/minecraft/client/util/Bans FIELD field_39720 TEMPORARY_TITLE Lnet/minecraft/class_2561; FIELD field_39721 PERMANENT_TITLE Lnet/minecraft/class_2561; + FIELD field_46009 NAME_TITLE Lnet/minecraft/class_2561; + FIELD field_46010 SKIN_TITLE Lnet/minecraft/class_2561; + FIELD field_46011 SKIN_DESCRIPTION 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; @@ -16,3 +19,12 @@ CLASS net/minecraft/class_7588 net/minecraft/client/util/Bans ARG 0 banDetails METHOD method_44657 isTemporary (Lcom/mojang/authlib/minecraft/BanDetails;)Z ARG 0 banDetails + METHOD method_53554 createSkinBanScreen (Ljava/lang/Runnable;)Lnet/minecraft/class_407; + ARG 0 onClose + METHOD method_53555 (Ljava/lang/Runnable;Z)V + ARG 1 confirmed + METHOD method_53556 createUsernameBanScreen (Ljava/lang/String;Ljava/lang/Runnable;)Lnet/minecraft/class_407; + ARG 0 username + ARG 1 onClose + METHOD method_53557 (Ljava/lang/Runnable;Z)V + ARG 1 confirmed diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index acd1601b1d..feb8cb0064 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -362,6 +362,10 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_52543 updateAttributes ()V METHOD method_52544 setAbsorptionAmountUnclamped (F)V ARG 1 absorptionAmount + METHOD method_53510 getHitbox ()Lnet/minecraft/class_238; + COMMENT Gets the area in which this entity can be attacked by mobs whose attack box overlaps it. + COMMENT + COMMENT @see MobEntity#getAttackBox METHOD method_5973 canTarget (Lnet/minecraft/class_1299;)Z ARG 1 type METHOD method_5989 getLootTable ()Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index abdaaf9c7b..fef7d7c0eb 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -28,6 +28,7 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity COMMENT @see MobEntity#initEquipment FIELD field_34043 DEFAULT_DROP_CHANCE F FIELD field_38386 ITEM_PICK_UP_RANGE_EXPANDER Lnet/minecraft/class_2382; + FIELD field_45969 ATTACK_RANGE D FIELD field_6184 lootTableSeed J FIELD field_6185 targetSelector Lnet/minecraft/class_1355; COMMENT Contains goals used to select this entity's target. @@ -147,6 +148,10 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity ARG 1 predicate METHOD method_51503 onFinishPathfinding ()V METHOD method_51504 onStartPathfinding ()V + METHOD method_53511 getAttackBox ()Lnet/minecraft/class_238; + COMMENT Gets the area in which this mob can attack entities whose hitbox intersects it. + COMMENT + COMMENT @see LivingEntity#getHitbox METHOD method_5929 getDropChance (Lnet/minecraft/class_1304;)F ARG 1 slot METHOD method_5930 setForwardSpeed (F)V diff --git a/mappings/net/minecraft/predicate/StatePredicate.mapping b/mappings/net/minecraft/predicate/StatePredicate.mapping index 0f242290cf..48b1e5af23 100644 --- a/mappings/net/minecraft/predicate/StatePredicate.mapping +++ b/mappings/net/minecraft/predicate/StatePredicate.mapping @@ -60,7 +60,7 @@ CLASS net/minecraft/class_4559 net/minecraft/predicate/StatePredicate FIELD field_45780 CODEC Lcom/mojang/serialization/Codec; METHOD comp_1834 min ()Ljava/util/Optional; METHOD comp_1835 max ()Ljava/util/Optional; - CLASS class_8750 + CLASS class_8750 ValueMatcher FIELD field_45781 CODEC Lcom/mojang/serialization/Codec; METHOD method_22532 test (Lnet/minecraft/class_2688;Lnet/minecraft/class_2769;)Z ARG 1 state diff --git a/mappings/net/minecraft/predicate/entity/VariantPredicates.mapping b/mappings/net/minecraft/predicate/entity/VariantPredicates.mapping index 7c62330077..a1da5e1a98 100644 --- a/mappings/net/minecraft/predicate/entity/VariantPredicates.mapping +++ b/mappings/net/minecraft/predicate/entity/VariantPredicates.mapping @@ -13,5 +13,5 @@ CLASS net/minecraft/class_7380 net/minecraft/predicate/entity/VariantPredicates METHOD method_47840 create (Lcom/mojang/serialization/Codec;Ljava/util/function/Function;)Lnet/minecraft/class_7380; ARG 0 codec ARG 1 variantGetter - CLASS class_8746 + CLASS class_8746 Predicate FIELD comp_1776 getDeserializer Lnet/minecraft/class_7376$class_8745; diff --git a/mappings/net/minecraft/screen/slot/Slot.mapping b/mappings/net/minecraft/screen/slot/Slot.mapping index f812c67e5d..d254292ece 100644 --- a/mappings/net/minecraft/screen/slot/Slot.mapping +++ b/mappings/net/minecraft/screen/slot/Slot.mapping @@ -37,7 +37,10 @@ CLASS net/minecraft/class_1735 net/minecraft/screen/slot/Slot COMMENT Sets the slot's stack to {@code stack} and marks the slot as dirty. Subclasses COMMENT may override this method to perform additional operations. ARG 1 stack + ARG 2 previousStack METHOD method_51306 canBeHighlighted ()Z + METHOD method_53512 setStack (Lnet/minecraft/class_1799;)V + ARG 1 stack METHOD method_7667 onTakeItem (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;)V ARG 1 player ARG 2 stack diff --git a/mappings/net/minecraft/sound/BlockSoundGroup.mapping b/mappings/net/minecraft/sound/BlockSoundGroup.mapping index b58db4b796..a07d6c1cd9 100644 --- a/mappings/net/minecraft/sound/BlockSoundGroup.mapping +++ b/mappings/net/minecraft/sound/BlockSoundGroup.mapping @@ -109,6 +109,8 @@ CLASS net/minecraft/class_2498 net/minecraft/sound/BlockSoundGroup FIELD field_43255 SUSPICIOUS_GRAVEL Lnet/minecraft/class_2498; FIELD field_43256 DECORATED_POT_SHATTER Lnet/minecraft/class_2498; FIELD field_44608 INTENTIONALLY_EMPTY Lnet/minecraft/class_2498; + FIELD field_45970 SPONGE Lnet/minecraft/class_2498; + FIELD field_45971 WET_SPONGE Lnet/minecraft/class_2498; METHOD (FFLnet/minecraft/class_3414;Lnet/minecraft/class_3414;Lnet/minecraft/class_3414;Lnet/minecraft/class_3414;Lnet/minecraft/class_3414;)V ARG 1 volume ARG 2 pitch diff --git a/mappings/net/minecraft/test/TestRunner.mapping b/mappings/net/minecraft/test/TestRunner.mapping index abdfe98ee4..cf1941bdb3 100644 --- a/mappings/net/minecraft/test/TestRunner.mapping +++ b/mappings/net/minecraft/test/TestRunner.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_4515 net/minecraft/test/TestRunner FIELD field_20556 sizeZ I METHOD (Ljava/util/Collection;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;Lnet/minecraft/class_4521;I)V ARG 1 batches + ARG 2 pos ARG 3 rotation ARG 4 world ARG 5 testManager