From b26d6f6764bf6b12f1cfdcf40b2d95662a9209ba Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Thu, 17 Aug 2023 16:26:56 +0100 Subject: [PATCH] 23w33a --- build.gradle | 2 +- mappings/net/minecraft/class_4559.mapping | 3 - mappings/net/minecraft/class_7380.mapping | 3 - mappings/net/minecraft/class_8768.mapping | 13 ++++ .../minecraft/client/MinecraftClient.mapping | 28 ++------ .../net/minecraft/client/QuickPlay.mapping | 4 +- .../minecraft/client/gui/hud/DebugHud.mapping | 3 - .../AccessibilityOnboardingScreen.mapping | 2 +- .../SocialInteractionsPlayerListEntry.mapping | 3 +- ...SocialInteractionsPlayerListWidget.mapping | 2 - .../screen/report/ChatReportScreen.mapping | 67 +------------------ .../screen/report/ChatSelectionScreen.mapping | 4 +- .../client/gui/widget/EntryListWidget.mapping | 3 - .../client/option/GameOptions.mapping | 4 -- .../realms/RealmsObjectSelectionList.mapping | 6 -- .../gui/screen/RealmsBackupInfoScreen.mapping | 1 - .../RealmsSelectWorldTemplateScreen.mapping | 40 +---------- .../render/TexturedRenderLayers.mapping | 2 +- .../client/report/AbuseReportContext.mapping | 6 +- .../client/report/AbuseReportSender.mapping | 3 +- .../client/report/ChatAbuseReport.mapping | 56 +--------------- .../net/minecraft/client/report/Draft.mapping | 15 +++++ .../entity/AttackPosOffsettingMount.mapping | 6 -- .../net/minecraft/entity/LivingEntity.mapping | 3 - .../entity/ai/goal/MeleeAttackGoal.mapping | 5 +- .../minecraft/entity/mob/MobEntity.mapping | 4 -- .../entity/mob/RavagerEntity.mapping | 1 - .../entity/mob/VindicatorEntity.mapping | 3 - .../entity/passive/RabbitEntity.mapping | 3 - .../predicate/StatePredicate.mapping | 2 +- .../entity/VariantPredicates.mapping | 2 +- .../net/minecraft/screen/slot/Slot.mapping | 2 +- .../minecraft/server/MinecraftServer.mapping | 2 - .../net/minecraft/test/TestRunner.mapping | 1 - 34 files changed, 51 insertions(+), 253 deletions(-) delete mode 100644 mappings/net/minecraft/class_4559.mapping delete mode 100644 mappings/net/minecraft/class_7380.mapping create mode 100644 mappings/net/minecraft/class_8768.mapping create mode 100644 mappings/net/minecraft/client/report/Draft.mapping delete mode 100644 mappings/net/minecraft/entity/AttackPosOffsettingMount.mapping diff --git a/build.gradle b/build.gradle index 440b56ddfa..d148188886 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "23w32a" +def minecraft_version = "23w33a" filament { minecraftVersion = minecraft_version diff --git a/mappings/net/minecraft/class_4559.mapping b/mappings/net/minecraft/class_4559.mapping deleted file mode 100644 index 1b199ebd8a..0000000000 --- a/mappings/net/minecraft/class_4559.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_4559 - CLASS class_8750 - METHOD method_22532 test (Lnet/minecraft/class_2688;Lnet/minecraft/class_2769;)Z diff --git a/mappings/net/minecraft/class_7380.mapping b/mappings/net/minecraft/class_7380.mapping deleted file mode 100644 index 77de937616..0000000000 --- a/mappings/net/minecraft/class_7380.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_7380 - CLASS class_8746 - FIELD comp_1776 getDeserializer Lnet/minecraft/class_7376$class_8745; diff --git a/mappings/net/minecraft/class_8768.mapping b/mappings/net/minecraft/class_8768.mapping new file mode 100644 index 0000000000..71f4e1e20a --- /dev/null +++ b/mappings/net/minecraft/class_8768.mapping @@ -0,0 +1,13 @@ +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 5973880fb6..66b723a280 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -183,9 +183,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_45295 symlinkFinder Lnet/minecraft/class_8580; FIELD field_45899 gameProfileFuture Ljava/util/concurrent/CompletableFuture; FIELD field_45900 finishedLoading Z - FIELD field_45901 frameNanosLog Lnet/minecraft/class_8743; - FIELD field_45902 pingPerformanceLog Lnet/minecraft/class_8743; - FIELD field_45903 receivedPacketSizeLog Lnet/minecraft/class_8743; METHOD (Lnet/minecraft/class_542;)V ARG 1 args METHOD method_1476 checkIs64Bit ()Z @@ -338,21 +335,16 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient ARG 4 report METHOD method_22683 getWindow ()Lnet/minecraft/class_1041; METHOD method_22940 getBufferBuilders ()Lnet/minecraft/class_4599; - METHOD method_24040 (Ljava/util/Optional;)V - ARG 1 throwable METHOD method_24041 setMipmapLevels (I)V ARG 1 mipmapLevels - METHOD method_24226 handleResourceReloadException (Ljava/lang/Throwable;)V + METHOD method_24226 handleResourceReloadException (Ljava/lang/Throwable;Lnet/minecraft/class_310$class_8764;)V ARG 1 throwable - METHOD method_24228 (ZLjava/util/concurrent/CompletableFuture;Ljava/util/Optional;)V - ARG 3 error METHOD method_24287 getWindowTitle ()Ljava/lang/String; METHOD method_24288 updateWindowTitle ()V METHOD method_24289 getModStatus ()Lnet/minecraft/class_6683; METHOD method_24458 startMonitor (ZLnet/minecraft/class_4758;)Lnet/minecraft/class_3695; ARG 1 active ARG 2 monitor - METHOD method_24459 shouldMonitorTickDuration ()Z METHOD method_24460 endMonitor (ZLnet/minecraft/class_4758;)V ARG 1 active ARG 2 monitor @@ -382,7 +374,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_29970 setScreenAndRender (Lnet/minecraft/class_437;)V ARG 1 screen METHOD method_30049 getVideoWarningManager ()Lnet/minecraft/class_5407; - METHOD method_31186 onResourceReloadFailure (Ljava/lang/Throwable;Lnet/minecraft/class_2561;)V + METHOD method_31186 onResourceReloadFailure (Ljava/lang/Throwable;Lnet/minecraft/class_2561;Lnet/minecraft/class_310$class_8764;)V ARG 1 exception ARG 2 resourceName METHOD method_31320 getSocialInteractionsManager ()Lnet/minecraft/class_5520; @@ -427,7 +419,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_35704 (Ljava/io/File;Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583; ARG 1 style METHOD method_35706 isRealmsEnabled ()Z - METHOD method_36561 reloadResources (Z)Ljava/util/concurrent/CompletableFuture; + METHOD method_36561 reloadResources (ZLnet/minecraft/class_310$class_8764;)Ljava/util/concurrent/CompletableFuture; ARG 1 force 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 @@ -490,7 +482,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_44377 getAbuseReportContext ()Lnet/minecraft/class_7574; METHOD method_44646 getRealmsPeriodicCheckers ()Lnet/minecraft/class_7578; METHOD method_44647 getMultiplayerBanDetails ()Lcom/mojang/authlib/minecraft/BanDetails; - METHOD method_44649 isMultiplayerBanned ()Z METHOD method_44713 getNarratorManager ()Lnet/minecraft/class_333; METHOD method_44714 getMessageHandler ()Lnet/minecraft/class_7594; METHOD method_45573 getDefaultResourcePack ()Lnet/minecraft/class_3268; @@ -508,17 +499,9 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_48186 getNavigationType ()Lnet/minecraft/class_8015; METHOD method_49292 showResourceReloadFailureToast (Lnet/minecraft/class_2561;)V ARG 1 description - METHOD method_49293 (ZLjava/lang/Throwable;)V - ARG 2 throwable METHOD method_49294 onForcedResourceReloadFailure ()V - METHOD method_51251 onInitFinished (Lnet/minecraft/class_4341;Lnet/minecraft/class_4011;Lnet/minecraft/class_542$class_8495;)V - ARG 1 realms - ARG 2 reload - ARG 3 quickPlay - METHOD method_51252 (Lnet/minecraft/class_4341;Lnet/minecraft/class_4011;Lnet/minecraft/class_542;Z)V - ARG 4 confirmed METHOD method_51253 getQuickPlayLogger ()Lnet/minecraft/class_8497; - METHOD method_51736 collectLoadTimes ()V + METHOD method_51736 collectLoadTimes (Lnet/minecraft/class_310$class_8764;)V METHOD method_52699 getGuiAtlasManager ()Lnet/minecraft/class_8658; METHOD method_52700 getCommandHistoryManager ()Lnet/minecraft/class_8657; METHOD method_52701 uuidEquals (Ljava/util/UUID;)Z @@ -527,8 +510,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_52703 enterReconfiguration (Lnet/minecraft/class_437;)V ARG 1 screen METHOD method_53462 getGameProfile ()Lcom/mojang/authlib/GameProfile; - METHOD method_53463 getFrameNanosLog ()Lnet/minecraft/class_8743; - METHOD method_53465 onFinishedLoading ()V + METHOD method_53465 onFinishedLoading (Lnet/minecraft/class_310$class_8764;)V METHOD method_53466 isFinishedLoading ()Z CLASS class_5859 ChatRestriction COMMENT Represents the restrictions on chat on a Minecraft client. diff --git a/mappings/net/minecraft/client/QuickPlay.mapping b/mappings/net/minecraft/client/QuickPlay.mapping index f815bb9b57..997096c7a6 100644 --- a/mappings/net/minecraft/client/QuickPlay.mapping +++ b/mappings/net/minecraft/client/QuickPlay.mapping @@ -12,11 +12,9 @@ CLASS net/minecraft/class_8496 net/minecraft/client/QuickPlay ARG 0 client ARG 1 realmsClient ARG 2 realmId - METHOD method_51260 startQuickPlay (Lnet/minecraft/class_310;Lnet/minecraft/class_542$class_8495;Lnet/minecraft/class_4011;Lnet/minecraft/class_4341;)V + 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 resourceReload - ARG 3 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 089f52eafe..98490bc671 100644 --- a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping @@ -13,8 +13,6 @@ 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; - 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; @@ -59,7 +57,6 @@ CLASS net/minecraft/class_340 net/minecraft/client/gui/hud/DebugHud ARG 1 context ARG 2 text ARG 3 left - METHOD method_53467 getTickChart ()Lnet/minecraft/class_8759; 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/screen/AccessibilityOnboardingScreen.mapping b/mappings/net/minecraft/client/gui/screen/AccessibilityOnboardingScreen.mapping index 593dff8048..7a18d20d88 100644 --- a/mappings/net/minecraft/client/gui/screen/AccessibilityOnboardingScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/AccessibilityOnboardingScreen.mapping @@ -7,7 +7,7 @@ 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 - METHOD (Lnet/minecraft/class_315;)V + METHOD (Lnet/minecraft/class_315;Ljava/lang/Runnable;)V ARG 1 gameOptions METHOD method_48259 yMargin ()I METHOD method_48260 tickNarratorPrompt ()V diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping index 72afdc3a81..df617168d8 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping @@ -25,7 +25,6 @@ CLASS net/minecraft/class_5519 net/minecraft/client/gui/screen/multiplayer/Socia FIELD field_39736 REPORT_DISABLED_TEXT Lnet/minecraft/class_2561; FIELD field_39790 sentMessage Z FIELD field_39791 canSendReports Z - FIELD field_39936 NOT_REPORTABLE_TEXT Lnet/minecraft/class_2561; FIELD field_39937 reportable Z FIELD field_40796 hasDraftReport Z FIELD field_45560 DRAFT_REPORT_ICON_TEXTURE Lnet/minecraft/class_2960; @@ -53,7 +52,7 @@ CLASS net/minecraft/class_5519 net/minecraft/client/gui/screen/multiplayer/Socia METHOD method_31389 getNarrationMessage (Lnet/minecraft/class_5250;)Lnet/minecraft/class_5250; ARG 1 text METHOD method_31390 getStatusText ()Lnet/minecraft/class_2561; - METHOD method_44525 (Lnet/minecraft/class_7574;Lnet/minecraft/class_310;Lnet/minecraft/class_5522;Ljava/util/UUID;Lnet/minecraft/class_4185;)V + METHOD method_44525 (Lnet/minecraft/class_7574;Lnet/minecraft/class_310;Lnet/minecraft/class_5522;Lnet/minecraft/class_4185;)V ARG 4 button METHOD method_44753 setSentMessage (Z)V ARG 1 sentMessage diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListWidget.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListWidget.mapping index 2a14c5ddae..aca6cc39d0 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListWidget.mapping @@ -38,8 +38,6 @@ CLASS net/minecraft/class_5521 net/minecraft/client/gui/screen/multiplayer/Socia ARG 2 includeOffline METHOD method_44760 (Lnet/minecraft/class_5519;)Ljava/lang/Integer; ARG 0 player - METHOD method_44761 (Lnet/minecraft/class_5519;)Ljava/lang/Integer; - ARG 1 player METHOD method_44762 sortPlayers ()V METHOD method_45665 collectReportableProfiles (Lnet/minecraft/class_7555;)Ljava/util/Collection; ARG 0 log diff --git a/mappings/net/minecraft/client/gui/screen/report/ChatReportScreen.mapping b/mappings/net/minecraft/client/gui/screen/report/ChatReportScreen.mapping index 6f32e57470..b556cba48b 100644 --- a/mappings/net/minecraft/client/gui/screen/report/ChatReportScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/report/ChatReportScreen.mapping @@ -1,60 +1,18 @@ CLASS net/minecraft/class_7538 net/minecraft/client/gui/screen/report/ChatReportScreen - FIELD field_39555 parent Lnet/minecraft/class_437; - FIELD field_39556 context Lnet/minecraft/class_7574; - FIELD field_39557 reasonDescription Lnet/minecraft/class_5489; - FIELD field_39558 editBox Lnet/minecraft/class_7529; FIELD field_39559 sendButton Lnet/minecraft/class_4185; - FIELD field_39561 validationError Lnet/minecraft/class_7566$class_7567; FIELD field_39562 BOTTOM_BUTTON_WIDTH I - FIELD field_39563 BUTTON_HEIGHT I - FIELD field_39564 BUTTON_TOP_MARGIN I - FIELD field_39565 BUTTON_BOTTOM_MARGIN I - FIELD field_39566 REASON_DESCRIPTION_TOP_MARGIN I - FIELD field_39567 REASON_DESCRIPTION_TEXT_WIDTH I - FIELD field_39568 SCREEN_HEIGHT I - FIELD field_39569 OBSERVED_WHAT_TEXT Lnet/minecraft/class_2561; - FIELD field_39570 SELECT_REASON_TEXT Lnet/minecraft/class_2561; - FIELD field_39571 MORE_COMMENTS_TEXT Lnet/minecraft/class_2561; - FIELD field_39572 DESCRIBE_TEXT Lnet/minecraft/class_2561; - FIELD field_39573 REPORT_SENT_MESSAGE_TEXT Lnet/minecraft/class_2561; FIELD field_39574 SELECT_CHAT_TEXT Lnet/minecraft/class_2561; - FIELD field_39575 SENDING_TEXT Lnet/minecraft/class_2561; - FIELD field_39576 GENERIC_ERROR_TEXT Lnet/minecraft/class_2561; - FIELD field_39577 LOGGER Lorg/slf4j/Logger; - FIELD field_39748 REPORT_SENT_TITLE Lnet/minecraft/class_2561; - FIELD field_39749 REPORT_ERROR_TITLE Lnet/minecraft/class_2561; - FIELD field_40793 report Lnet/minecraft/class_7566; 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_7855;)V - ARG 1 parent + METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_7574;Lnet/minecraft/class_7566$class_8772;)V ARG 2 context - ARG 3 draft 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_44456 getTop ()I - METHOD method_44457 getBottom ()I - METHOD method_44458 getSelectionButtonY ()I - METHOD method_44459 getReasonButtonY ()I - METHOD method_44460 getEditBoxTop ()I - METHOD method_44461 getEditBoxBottom ()I - METHOD method_44462 getBottomButtonsY ()I METHOD method_44465 (Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_44466 onSubmissionFinished ()V - METHOD method_44467 (Ljava/lang/Object;Ljava/lang/Throwable;)Ljava/lang/Object; - ARG 1 unit - ARG 2 throwable - METHOD method_44468 onSubmissionError (Ljava/lang/Throwable;)V - ARG 1 throwable - METHOD method_44470 (Lnet/minecraft/class_7566$class_7568;)V - ARG 1 report - METHOD method_44471 (Lnet/minecraft/class_7566;)V - ARG 1 report METHOD method_44472 (Lnet/minecraft/class_7573;)V ARG 1 reason METHOD method_44473 (Ljava/lang/String;)V @@ -66,26 +24,3 @@ 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_44479 send ()V - METHOD method_44480 getWidgetsLeft ()I - METHOD method_44481 getWidgetsRight ()I - METHOD method_45053 (Lnet/minecraft/class_7566$class_7567;)V - ARG 1 validationError - METHOD method_45054 showErrorScreen (Lnet/minecraft/class_2561;)V - ARG 1 message - METHOD method_46516 setDraft ()V - METHOD method_46517 clearDraft ()V - METHOD method_47430 (Lnet/minecraft/class_7566$class_7567;)Lnet/minecraft/class_7919; - ARG 0 error - 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/ChatSelectionScreen.mapping b/mappings/net/minecraft/client/gui/screen/report/ChatSelectionScreen.mapping index 224b587d08..63409c5ad9 100644 --- a/mappings/net/minecraft/client/gui/screen/report/ChatSelectionScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/report/ChatSelectionScreen.mapping @@ -3,14 +3,14 @@ CLASS net/minecraft/class_7543 net/minecraft/client/gui/screen/report/ChatSelect FIELD field_39585 reporter Lnet/minecraft/class_7574; FIELD field_39586 doneButton Lnet/minecraft/class_4185; FIELD field_39587 selectionList Lnet/minecraft/class_7543$class_7544; - FIELD field_39588 report Lnet/minecraft/class_7566; + FIELD field_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_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;Ljava/util/function/Consumer;)V + METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_7574;Lnet/minecraft/class_7566$class_8772;Ljava/util/function/Consumer;)V ARG 1 parent ARG 2 reporter ARG 3 report diff --git a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping index 38697e389b..ecdb47f137 100644 --- a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping @@ -9,7 +9,6 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget FIELD field_22742 width I FIELD field_22743 height I FIELD field_22744 centerListVertically Z - FIELD field_22746 renderSelection Z FIELD field_22747 renderHeader Z FIELD field_22748 headerHeight I FIELD field_22749 scrollAmount D @@ -94,8 +93,6 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget METHOD method_25340 getEntryCount ()I METHOD method_25341 getScrollAmount ()D METHOD method_25342 getRowLeft ()I - METHOD method_29344 setRenderSelection (Z)V - ARG 1 renderSelection METHOD method_29621 setEntryParentList (Lnet/minecraft/class_350$class_351;)V ARG 1 entry METHOD method_31322 setRenderBackground (Z)V diff --git a/mappings/net/minecraft/client/option/GameOptions.mapping b/mappings/net/minecraft/client/option/GameOptions.mapping index f4a9cdc9ca..a463466459 100644 --- a/mappings/net/minecraft/client/option/GameOptions.mapping +++ b/mappings/net/minecraft/client/option/GameOptions.mapping @@ -74,7 +74,6 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions FIELD field_1863 client Lnet/minecraft/class_310; FIELD field_1864 lastServer Ljava/lang/String; FIELD field_1865 invertYMouse Lnet/minecraft/class_7172; - FIELD field_1866 debugEnabled Z FIELD field_1867 sprintKey Lnet/minecraft/class_304; COMMENT A key binding for sprinting. COMMENT Bound to {@linkplain org.lwjgl.glfw.GLFW#GLFW_KEY_LEFT_CONTROL the left control key} by default. @@ -105,7 +104,6 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions FIELD field_1879 saveToolbarActivatorKey Lnet/minecraft/class_304; COMMENT A key binding for saving the hotbar items in {@linkplain net.minecraft.world.GameMode#CREATIVE creative mode}. COMMENT Bound to {@linkplain org.lwjgl.glfw.GLFW#GLFW_KEY_C the C key} by default. - FIELD field_1880 debugProfilerEnabled Z FIELD field_1881 backKey Lnet/minecraft/class_304; COMMENT A key binding for moving backward. COMMENT Bound to {@linkplain org.lwjgl.glfw.GLFW#GLFW_KEY_S the S key} by default. @@ -124,7 +122,6 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions COMMENT Bound to {@linkplain org.lwjgl.glfw.GLFW#GLFW_KEY_T the T key} by default. FIELD field_1891 bobView Lnet/minecraft/class_7172; FIELD field_1892 enabledPlayerModelParts Ljava/util/Set; - FIELD field_1893 debugTpsEnabled Z FIELD field_1894 forwardKey Lnet/minecraft/class_304; COMMENT A key binding for moving forward. COMMENT Bound to {@linkplain org.lwjgl.glfw.GLFW#GLFW_KEY_W the W key} by default. @@ -222,7 +219,6 @@ 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_45904 debugPacketSizeEnabled Z METHOD (Lnet/minecraft/class_310;Ljava/io/File;)V ARG 1 client ARG 2 optionsFile diff --git a/mappings/net/minecraft/client/realms/RealmsObjectSelectionList.mapping b/mappings/net/minecraft/client/realms/RealmsObjectSelectionList.mapping index 81d69e08dd..49ce80d1d4 100644 --- a/mappings/net/minecraft/client/realms/RealmsObjectSelectionList.mapping +++ b/mappings/net/minecraft/client/realms/RealmsObjectSelectionList.mapping @@ -7,12 +7,6 @@ CLASS net/minecraft/class_4904 net/minecraft/client/realms/RealmsObjectSelection ARG 5 itemHeight METHOD method_25489 setSelected (I)V ARG 1 index - METHOD method_25490 itemClicked (IIDDII)V - ARG 1 cursorY - ARG 2 selectionIndex - ARG 3 mouseX - ARG 5 mouseY - ARG 7 listWidth METHOD method_25492 setSelectedItem (I)V ARG 1 index METHOD method_25493 clear ()V diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsBackupInfoScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsBackupInfoScreen.mapping index 76a8d68e4d..28fb6b4c3e 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsBackupInfoScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsBackupInfoScreen.mapping @@ -4,7 +4,6 @@ CLASS net/minecraft/class_4379 net/minecraft/client/realms/gui/screen/RealmsBack FIELD field_19738 backupInfoList Lnet/minecraft/class_4379$class_4380; FIELD field_27937 UNKNOWN Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_4867;)V - ARG 1 parent ARG 2 backup METHOD method_21140 gameDifficultyMetadata (Ljava/lang/String;)Lnet/minecraft/class_2561; ARG 1 value diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectWorldTemplateScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectWorldTemplateScreen.mapping index 6fab7b68be..f3655a0cb2 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectWorldTemplateScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectWorldTemplateScreen.mapping @@ -1,24 +1,16 @@ CLASS net/minecraft/class_4419 net/minecraft/client/realms/gui/screen/RealmsSelectWorldTemplateScreen FIELD field_20069 LOGGER Lorg/slf4j/Logger; FIELD field_20071 templateList Lnet/minecraft/class_4419$class_4420; - FIELD field_20072 selectedTemplate I + FIELD field_20072 selectedTemplate Lnet/minecraft/class_4890; FIELD field_20074 selectButton Lnet/minecraft/class_4185; FIELD field_20075 trailerButton Lnet/minecraft/class_4185; FIELD field_20076 publisherButton Lnet/minecraft/class_4185; - FIELD field_20077 tooltip Lnet/minecraft/class_2561; FIELD field_20078 currentLink Ljava/lang/String; FIELD field_20079 worldType Lnet/minecraft/class_4877$class_4321; - FIELD field_20080 clicks I FIELD field_20081 warning [Lnet/minecraft/class_2561; FIELD field_20085 noTemplatesMessage Ljava/util/List; FIELD field_22721 SLOT_FRAME_TEXTURE Lnet/minecraft/class_2960; - FIELD field_26512 INFO_TOOLTIP Lnet/minecraft/class_2561; - FIELD field_26513 TRAILER_TOOLTIP Lnet/minecraft/class_2561; FIELD field_27941 callback Ljava/util/function/Consumer; - FIELD field_45281 LINK_HIGHLIGHTED_ICON_TEXTURE Lnet/minecraft/class_2960; - FIELD field_45282 LINK_ICON_TEXTURE Lnet/minecraft/class_2960; - FIELD field_45283 VIDEO_LINK_HIGHLIGHTED_ICON_TEXTURE Lnet/minecraft/class_2960; - FIELD field_45284 VIDEO_LINK_ICON_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2561;Ljava/util/function/Consumer;Lnet/minecraft/class_4877$class_4321;)V ARG 1 title ARG 2 callback @@ -41,10 +33,6 @@ CLASS net/minecraft/class_4419 net/minecraft/client/realms/gui/screen/RealmsSele METHOD method_21425 updateButtonStates ()V METHOD method_21429 setWarning ([Lnet/minecraft/class_2561;)V ARG 1 warning - METHOD method_21430 shouldSelectButtonBeActive ()Z - METHOD method_21432 shouldPublisherBeVisible ()Z - METHOD method_21434 getSelectedTemplate ()Lnet/minecraft/class_4890; - METHOD method_21436 shouldTrailerBeVisible ()Z METHOD method_21440 selectTemplate ()V METHOD method_21442 onTrailer ()V METHOD method_21444 onPublish ()V @@ -58,15 +46,12 @@ CLASS net/minecraft/class_4419 net/minecraft/client/realms/gui/screen/RealmsSele ARG 1 button METHOD method_25236 (Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_25247 isSelectionValid ()Z CLASS class_4420 WorldTemplateObjectSelectionList METHOD (Lnet/minecraft/class_4419;)V ARG 1 screen METHOD (Lnet/minecraft/class_4419;Ljava/lang/Iterable;)V ARG 2 templates METHOD method_21446 isEmpty ()Z - METHOD method_21447 getItem (I)Lnet/minecraft/class_4890; - ARG 1 index METHOD method_21448 addEntry (Lnet/minecraft/class_4890;)V ARG 1 template METHOD method_21450 getValues ()Ljava/util/List; @@ -76,26 +61,3 @@ CLASS net/minecraft/class_4419 net/minecraft/client/realms/gui/screen/RealmsSele FIELD field_20094 mTemplate Lnet/minecraft/class_4890; METHOD (Lnet/minecraft/class_4419;Lnet/minecraft/class_4890;)V ARG 2 template - METHOD method_21451 drawImage (Lnet/minecraft/class_332;IIIILnet/minecraft/class_4890;)V - ARG 1 context - ARG 2 x - ARG 3 y - ARG 4 mouseX - ARG 5 mouseY - ARG 6 template - METHOD method_21452 drawIcons (Lnet/minecraft/class_332;IIIILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V - ARG 1 context - ARG 2 x - ARG 3 y - ARG 4 mouseX - ARG 5 mouseY - ARG 6 link - ARG 7 trailer - ARG 8 recommendedPlayers - METHOD method_21453 renderWorldTemplateItem (Lnet/minecraft/class_332;Lnet/minecraft/class_4890;IIII)V - ARG 1 context - ARG 2 template - ARG 3 x - ARG 4 y - ARG 5 mouseX - ARG 6 mouseY diff --git a/mappings/net/minecraft/client/render/TexturedRenderLayers.mapping b/mappings/net/minecraft/client/render/TexturedRenderLayers.mapping index c631d99f96..e015593cd4 100644 --- a/mappings/net/minecraft/client/render/TexturedRenderLayers.mapping +++ b/mappings/net/minecraft/client/render/TexturedRenderLayers.mapping @@ -70,7 +70,7 @@ CLASS net/minecraft/class_4722 net/minecraft/client/render/TexturedRenderLayers METHOD method_45782 createHangingSignTextureId (Lnet/minecraft/class_4719;)Lnet/minecraft/class_4730; ARG 0 type METHOD method_45783 getHangingSign ()Lnet/minecraft/class_1921; - METHOD method_48480 getArmorTrims ()Lnet/minecraft/class_1921; + METHOD method_48480 getArmorTrims (Z)Lnet/minecraft/class_1921; 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/AbuseReportContext.mapping b/mappings/net/minecraft/client/report/AbuseReportContext.mapping index d05f2fd19c..3f882bf702 100644 --- a/mappings/net/minecraft/client/report/AbuseReportContext.mapping +++ b/mappings/net/minecraft/client/report/AbuseReportContext.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_7574 net/minecraft/client/report/AbuseReportContext FIELD field_40819 sender Lnet/minecraft/class_7563; FIELD field_40820 environment Lnet/minecraft/class_7569; FIELD field_40821 chatLog Lnet/minecraft/class_7555; - FIELD field_40822 draft Lnet/minecraft/class_7566$class_7855; + FIELD field_40822 draft Lnet/minecraft/class_7855; METHOD (Lnet/minecraft/class_7563;Lnet/minecraft/class_7569;Lnet/minecraft/class_7555;)V ARG 1 sender ARG 2 environment @@ -14,14 +14,14 @@ CLASS net/minecraft/class_7574 net/minecraft/client/report/AbuseReportContext ARG 0 environment ARG 1 userApiService METHOD method_46550 getSender ()Lnet/minecraft/class_7563; - METHOD method_46551 (Lnet/minecraft/class_310;Lnet/minecraft/class_437;Lnet/minecraft/class_7566$class_7855;Ljava/lang/Runnable;Z)V + METHOD method_46551 (Lnet/minecraft/class_310;Lnet/minecraft/class_7855;Lnet/minecraft/class_437;Ljava/lang/Runnable;Z)V ARG 5 confirmed METHOD method_46552 tryShowDraftScreen (Lnet/minecraft/class_310;Lnet/minecraft/class_437;Ljava/lang/Runnable;Z)V ARG 1 client ARG 2 parent ARG 3 callback ARG 4 quit - METHOD method_46553 setDraft (Lnet/minecraft/class_7566$class_7855;)V + METHOD method_46553 setDraft (Lnet/minecraft/class_7855;)V ARG 1 draft METHOD method_46554 draftPlayerUuidEquals (Ljava/util/UUID;)Z ARG 1 uuid diff --git a/mappings/net/minecraft/client/report/AbuseReportSender.mapping b/mappings/net/minecraft/client/report/AbuseReportSender.mapping index 7dce641be8..85f17e08f4 100644 --- a/mappings/net/minecraft/client/report/AbuseReportSender.mapping +++ b/mappings/net/minecraft/client/report/AbuseReportSender.mapping @@ -3,9 +3,8 @@ CLASS net/minecraft/class_7563 net/minecraft/client/report/AbuseReportSender METHOD method_44562 create (Lnet/minecraft/class_7569;Lcom/mojang/authlib/minecraft/UserApiService;)Lnet/minecraft/class_7563; ARG 0 environment ARG 1 userApiService - METHOD method_44563 send (Ljava/util/UUID;Lcom/mojang/authlib/minecraft/report/AbuseReport;)Ljava/util/concurrent/CompletableFuture; + 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 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/ChatAbuseReport.mapping b/mappings/net/minecraft/client/report/ChatAbuseReport.mapping index c7eca696b0..c4363aaedc 100644 --- a/mappings/net/minecraft/client/report/ChatAbuseReport.mapping +++ b/mappings/net/minecraft/client/report/ChatAbuseReport.mapping @@ -1,58 +1,4 @@ CLASS net/minecraft/class_7566 net/minecraft/client/report/ChatAbuseReport - FIELD field_39651 limits Lcom/mojang/authlib/minecraft/report/AbuseReportLimits; - FIELD field_40811 draft Lnet/minecraft/class_7566$class_7855; - METHOD (Ljava/util/UUID;Lcom/mojang/authlib/minecraft/report/AbuseReportLimits;)V - ARG 1 reportedPlayerUuid - ARG 2 limits - METHOD (Lnet/minecraft/class_7566$class_7855;Lcom/mojang/authlib/minecraft/report/AbuseReportLimits;)V - ARG 1 draft - ARG 2 limits - METHOD method_44568 getReportedPlayerUuid ()Ljava/util/UUID; - METHOD method_44569 toggleMessageSelection (I)V + METHOD method_44569 toggleMessageSelection (ILcom/mojang/authlib/minecraft/report/AbuseReportLimits;)V ARG 1 index - METHOD method_44570 toReportChatMessage (Lnet/minecraft/class_7557$class_7558;Z)Lcom/mojang/authlib/minecraft/report/ReportChatMessage; - ARG 1 message - ARG 2 selected - METHOD method_44571 collectEvidence (Lnet/minecraft/class_7555;)Lcom/mojang/authlib/minecraft/report/ReportEvidence; - ARG 1 log - METHOD method_44574 setReason (Lnet/minecraft/class_7573;)V - ARG 1 reason - METHOD method_44575 finalizeReport (Lnet/minecraft/class_7574;)Lcom/mojang/datafixers/util/Either; - ARG 1 reporter - METHOD method_44576 setOpinionComments (Ljava/lang/String;)V - ARG 1 opinionComments - METHOD method_44579 getSelections ()Lit/unimi/dsi/fastutil/ints/IntSet; - METHOD method_44580 hasSelectedMessage (I)Z - ARG 1 index - METHOD method_44582 getOpinionComments ()Ljava/lang/String; - METHOD method_44583 getReason ()Lnet/minecraft/class_7573; - METHOD method_44584 validate ()Lnet/minecraft/class_7566$class_7567; METHOD method_44585 copy ()Lnet/minecraft/class_7566; - METHOD method_44962 (Ljava/util/List;ILnet/minecraft/class_7557$class_7558;)V - ARG 2 index - ARG 3 message - METHOD method_46545 getDraft ()Lnet/minecraft/class_7566$class_7855; - METHOD method_46546 hasContents ()Z - CLASS class_7567 ValidationError - FIELD field_39655 NO_REASON Lnet/minecraft/class_7566$class_7567; - FIELD field_39656 NO_REPORTED_MESSAGES Lnet/minecraft/class_7566$class_7567; - FIELD field_39657 TOO_MANY_MESSAGES Lnet/minecraft/class_7566$class_7567; - FIELD field_39658 COMMENTS_TOO_LONG Lnet/minecraft/class_7566$class_7567; - CLASS class_7568 ReportWithId - CLASS class_7855 Draft - FIELD field_40813 reportId Ljava/util/UUID; - FIELD field_40814 currentTime Ljava/time/Instant; - FIELD field_40815 reportedPlayerUuid Ljava/util/UUID; - FIELD field_40816 selections Lit/unimi/dsi/fastutil/ints/IntSet; - FIELD field_40817 opinionComments Ljava/lang/String; - FIELD field_40818 reason Lnet/minecraft/class_7573; - METHOD (Lnet/minecraft/class_7566;Ljava/util/UUID;Ljava/time/Instant;Ljava/util/UUID;)V - ARG 2 reportId - ARG 3 currentTime - ARG 4 reportedPlayerUuid - METHOD method_46547 copy ()Lnet/minecraft/class_7566$class_7855; - METHOD method_46548 toggleMessageSelection (ILcom/mojang/authlib/minecraft/report/AbuseReportLimits;)V - ARG 1 index - ARG 2 limits - METHOD method_46549 playerUuidEquals (Ljava/util/UUID;)Z - ARG 1 uuid diff --git a/mappings/net/minecraft/client/report/Draft.mapping b/mappings/net/minecraft/client/report/Draft.mapping new file mode 100644 index 0000000000..9db6e464e7 --- /dev/null +++ b/mappings/net/minecraft/client/report/Draft.mapping @@ -0,0 +1,15 @@ +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/entity/AttackPosOffsettingMount.mapping b/mappings/net/minecraft/entity/AttackPosOffsettingMount.mapping deleted file mode 100644 index 09c81d0f01..0000000000 --- a/mappings/net/minecraft/entity/AttackPosOffsettingMount.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/class_7997 net/minecraft/entity/AttackPosOffsettingMount - COMMENT A mount which offsets the attack position of its passengers. - COMMENT @see net.minecraft.entity.LivingEntity#getAttackPos - METHOD method_47923 getPassengerAttackYOffset ()D - COMMENT {@return an offset to the Y co-ordinate of passengers' positions, for use in their attack positions} - COMMENT @see net.minecraft.entity.LivingEntity#getAttackPos diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 6dc95cd089..acd1601b1d 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -333,9 +333,6 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 1 attribute METHOD method_45326 getAttributeBaseValue (Lnet/minecraft/class_6880;)D ARG 1 attribute - METHOD method_47921 getAttackPos ()Lnet/minecraft/class_243; - COMMENT {@return this entity's attack position} Used to determine if a mob can perform a melee attack on this entity. May be offset by a mount. - COMMENT @see net.minecraft.entity.AttackPosOffsettingMount#getPassengerAttackYOffset METHOD method_48157 getDamageTiltYaw ()F METHOD method_48565 updateLimbs (F)V ARG 1 posDelta diff --git a/mappings/net/minecraft/entity/ai/goal/MeleeAttackGoal.mapping b/mappings/net/minecraft/entity/ai/goal/MeleeAttackGoal.mapping index 78c1342a65..4dd294a14c 100644 --- a/mappings/net/minecraft/entity/ai/goal/MeleeAttackGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/MeleeAttackGoal.mapping @@ -19,8 +19,5 @@ CLASS net/minecraft/class_1366 net/minecraft/entity/ai/goal/MeleeAttackGoal METHOD method_28347 isCooledDown ()Z METHOD method_28348 getCooldown ()I METHOD method_28349 getMaxCooldown ()I - METHOD method_6288 attack (Lnet/minecraft/class_1309;D)V + METHOD method_6288 attack (Lnet/minecraft/class_1309;)V ARG 1 target - ARG 2 squaredDistance - METHOD method_6289 getSquaredMaxAttackDistance (Lnet/minecraft/class_1309;)D - ARG 1 entity diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index 8ea4f9632d..abdaaf9c7b 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -134,8 +134,6 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity METHOD method_30759 enchantMainHandItem (Lnet/minecraft/class_5819;F)V ARG 1 random ARG 2 power - METHOD method_33191 squaredAttackRange (Lnet/minecraft/class_1309;)D - ARG 1 target METHOD method_35055 clearPositionTarget ()V METHOD method_35056 clearGoalsAndTasks ()V METHOD method_37341 (Lnet/minecraft/class_1799;)V @@ -147,8 +145,6 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity ARG 0 goal METHOD method_47825 clearGoals (Ljava/util/function/Predicate;)V ARG 1 predicate - METHOD method_47922 getSquaredDistanceToAttackPosOf (Lnet/minecraft/class_1309;)D - ARG 1 target METHOD method_51503 onFinishPathfinding ()V METHOD method_51504 onStartPathfinding ()V METHOD method_5929 getDropChance (Lnet/minecraft/class_1304;)F diff --git a/mappings/net/minecraft/entity/mob/RavagerEntity.mapping b/mappings/net/minecraft/entity/mob/RavagerEntity.mapping index ef4ea4aa52..4c13d605d4 100644 --- a/mappings/net/minecraft/entity/mob/RavagerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/RavagerEntity.mapping @@ -18,4 +18,3 @@ CLASS net/minecraft/class_1584 net/minecraft/entity/mob/RavagerEntity METHOD method_7072 getRoarTick ()I METHOD method_7073 spawnStunnedParticles ()V METHOD method_7074 getStunTick ()I - CLASS class_1585 AttackGoal diff --git a/mappings/net/minecraft/entity/mob/VindicatorEntity.mapping b/mappings/net/minecraft/entity/mob/VindicatorEntity.mapping index e78fe19a53..96f18871df 100644 --- a/mappings/net/minecraft/entity/mob/VindicatorEntity.mapping +++ b/mappings/net/minecraft/entity/mob/VindicatorEntity.mapping @@ -9,6 +9,3 @@ CLASS net/minecraft/class_1632 net/minecraft/entity/mob/VindicatorEntity METHOD (Lnet/minecraft/class_1632;)V ARG 1 vindicator CLASS class_3761 BreakDoorGoal - CLASS class_4293 AttackGoal - METHOD (Lnet/minecraft/class_1632;Lnet/minecraft/class_1632;)V - ARG 2 vindicator diff --git a/mappings/net/minecraft/entity/passive/RabbitEntity.mapping b/mappings/net/minecraft/entity/passive/RabbitEntity.mapping index aedb6d604a..67b1e75854 100644 --- a/mappings/net/minecraft/entity/passive/RabbitEntity.mapping +++ b/mappings/net/minecraft/entity/passive/RabbitEntity.mapping @@ -34,9 +34,6 @@ CLASS net/minecraft/class_1463 net/minecraft/entity/passive/RabbitEntity METHOD method_6618 startJump ()V METHOD method_6619 scheduleJump ()V METHOD method_6621 disableJump ()V - CLASS class_1464 RabbitAttackGoal - METHOD (Lnet/minecraft/class_1463;)V - ARG 1 rabbit CLASS class_1465 FleeGoal FIELD field_6853 rabbit Lnet/minecraft/class_1463; METHOD (Lnet/minecraft/class_1463;Ljava/lang/Class;FDD)V diff --git a/mappings/net/minecraft/predicate/StatePredicate.mapping b/mappings/net/minecraft/predicate/StatePredicate.mapping index 48b1e5af23..0f242290cf 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 ValueMatcher + CLASS class_8750 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 a1da5e1a98..7c62330077 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 Predicate + CLASS class_8746 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 321df61e6e..f812c67e5d 100644 --- a/mappings/net/minecraft/screen/slot/Slot.mapping +++ b/mappings/net/minecraft/screen/slot/Slot.mapping @@ -33,7 +33,7 @@ CLASS net/minecraft/class_1735 net/minecraft/screen/slot/Slot METHOD method_34265 (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;)V ARG 2 stack METHOD method_34266 getIndex ()I - METHOD method_48931 setStack (Lnet/minecraft/class_1799;)V + METHOD method_48931 setStack (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)V 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 diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index a1aac78ac1..893ecd48ff 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -75,7 +75,6 @@ CLASS net/minecraft/server/MinecraftServer FIELD field_4591 commandFunctionManager Lnet/minecraft/class_2991; FIELD field_4592 tickTime F FIELD field_4593 metadata Lnet/minecraft/class_2926; - FIELD field_45951 tickNanosLog Lnet/minecraft/class_8743; FIELD field_4595 dataPackManager Lnet/minecraft/class_3283; FIELD field_4596 playerIdleTimeout I FIELD field_4599 proxy Ljava/net/Proxy; @@ -437,7 +436,6 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_49750 sendTimeUpdatePackets (Lnet/minecraft/class_3218;)V ARG 1 world METHOD method_52344 shouldLogIps ()Z - METHOD method_53500 getTickNanosLog ()Lnet/minecraft/class_8743; METHOD method_5387 isMainThread ()Z CLASS class_6414 DebugStart FIELD field_33980 time J diff --git a/mappings/net/minecraft/test/TestRunner.mapping b/mappings/net/minecraft/test/TestRunner.mapping index cf1941bdb3..abdfe98ee4 100644 --- a/mappings/net/minecraft/test/TestRunner.mapping +++ b/mappings/net/minecraft/test/TestRunner.mapping @@ -9,7 +9,6 @@ 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