From 13aba8d3d70a21d1d80056d5c429cbfaf5a08cf6 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Sun, 22 Jan 2023 02:01:44 +0900 Subject: [PATCH] 23w03a more stuff (#3461) * Drop invalid mappings * Map screen stuff * Map widgets * Map misc stuff * Fix javadoc * Map more stuff --- .../minecraft/client/MinecraftClient.mapping | 4 ++ .../net/minecraft/client/gui/Element.mapping | 4 ++ .../client/gui/NavigationType.mapping | 3 -- .../client/gui/ParentElement.mapping | 18 ++++++++ .../client/gui/hud/InGameHud.mapping | 9 ++++ .../client/gui/hud/PlayerListHud.mapping | 7 +++ .../client/gui/navigation/FocusedPos.mapping | 10 +++++ .../client/gui/navigation/FocusedRect.mapping | 45 +++++++++++++++++++ .../gui/navigation/GuiNavigation.mapping | 6 +++ .../gui/navigation/GuiNavigationPath.mapping | 16 +++++++ .../gui/navigation/GuiNavigationType.mapping | 4 ++ .../NavigationAxis.mapping | 2 +- .../navigation/NavigationDirection.mapping | 30 +++++++++++++ .../gui/screen/NavigationDirection.mapping | 4 -- .../client/gui/screen/Screen.mapping | 15 ++++++- .../screen/option/ControlsListWidget.mapping | 5 +++ .../gui/screen/option/KeybindsScreen.mapping | 1 + .../option/TelemetryEventWidget.mapping | 2 + .../client/gui/screen/pack/PackScreen.mapping | 3 ++ .../client/gui/widget/AxisGridWidget.mapping | 8 ++++ .../gui/widget/ElementListWidget.mapping | 5 +++ .../client/gui/widget/EmptyWidget.mapping | 4 ++ .../client/gui/widget/EntryListWidget.mapping | 12 +++++ .../client/gui/widget/GridWidget.mapping | 9 ++++ .../NarratedMultilineTextWidget.mapping | 5 +++ .../gui/widget/ScrollableWidget.mapping | 1 + .../widget/SimplePositioningWidget.mapping | 2 + .../client/gui/widget/SliderWidget.mapping | 3 ++ .../client/gui/widget/TextFieldWidget.mapping | 5 +++ .../client/gui/widget/Widget.mapping | 2 + .../client/gui/widget/WrapperWidget.mapping | 11 +++++ .../client/option/GameOptions.mapping | 2 + .../gui/screen/RealmsMainScreen.mapping | 19 ++++++++ .../RealmsSelectFileToUploadScreen.mapping | 2 + .../language/LanguageDefinition.mapping | 6 +-- .../minecraft/datafixer/DataFixTypes.mapping | 4 +- mappings/net/minecraft/entity/Entity.mapping | 27 +++++++++-- .../ai/pathing/EntityNavigation.mapping | 2 + .../painting/PaintingEntity.mapping | 1 - .../entity/passive/AxolotlEntity.mapping | 1 - .../entity/passive/CamelEntity.mapping | 3 ++ .../entity/passive/FrogEntity.mapping | 1 - .../entity/passive/HorseEntity.mapping | 1 - .../entity/passive/LlamaEntity.mapping | 1 - .../entity/passive/ParrotEntity.mapping | 1 - .../network/listener/PacketListener.mapping | 4 +- .../server/command/DataCommand.mapping | 8 ++++ .../net/minecraft/util/dynamic/Codecs.mapping | 6 ++- .../net/minecraft/util/math/Vec3i.mapping | 2 + .../world/level/storage/LevelSummary.mapping | 2 + 50 files changed, 320 insertions(+), 28 deletions(-) delete mode 100644 mappings/net/minecraft/client/gui/NavigationType.mapping create mode 100644 mappings/net/minecraft/client/gui/navigation/FocusedPos.mapping create mode 100644 mappings/net/minecraft/client/gui/navigation/FocusedRect.mapping create mode 100644 mappings/net/minecraft/client/gui/navigation/GuiNavigation.mapping create mode 100644 mappings/net/minecraft/client/gui/navigation/GuiNavigationPath.mapping create mode 100644 mappings/net/minecraft/client/gui/navigation/GuiNavigationType.mapping rename mappings/net/minecraft/client/gui/{screen => navigation}/NavigationAxis.mapping (77%) create mode 100644 mappings/net/minecraft/client/gui/navigation/NavigationDirection.mapping delete mode 100644 mappings/net/minecraft/client/gui/screen/NavigationDirection.mapping diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 98d1aef381..581e29372e 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -180,6 +180,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_40381 serverResourcePackProvider Lnet/minecraft/class_1066; FIELD field_41331 telemetryManager Lnet/minecraft/class_6628; FIELD field_41332 renderTime J + FIELD field_41782 navigationType Lnet/minecraft/class_8015; METHOD (Lnet/minecraft/class_542;)V ARG 1 args METHOD method_1476 checkIs64Bit ()Z @@ -506,6 +507,9 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_47600 getRenderTime ()J METHOD method_47601 getTelemetryManager ()Lnet/minecraft/class_6628; METHOD method_47602 isOptionalTelemetryEnabled ()Z + METHOD method_48185 setNavigationType (Lnet/minecraft/class_8015;)V + ARG 1 navigationType + METHOD method_48186 getNavigationType ()Lnet/minecraft/class_8015; CLASS class_5859 ChatRestriction COMMENT Represents the restrictions on chat on a Minecraft client. COMMENT diff --git a/mappings/net/minecraft/client/gui/Element.mapping b/mappings/net/minecraft/client/gui/Element.mapping index fbe48c884f..8e976bece1 100644 --- a/mappings/net/minecraft/client/gui/Element.mapping +++ b/mappings/net/minecraft/client/gui/Element.mapping @@ -135,3 +135,7 @@ CLASS net/minecraft/class_364 net/minecraft/client/gui/Element COMMENT the Y coordinate of the mouse ARG 5 button COMMENT the mouse button number + METHOD method_48202 getNavigationFocus ()Lnet/minecraft/class_8030; + METHOD method_48205 getNavigationPath (Lnet/minecraft/class_8023;)Lnet/minecraft/class_8016; + ARG 1 navigation + METHOD method_48218 getFocusedPath ()Lnet/minecraft/class_8016; diff --git a/mappings/net/minecraft/client/gui/NavigationType.mapping b/mappings/net/minecraft/client/gui/NavigationType.mapping deleted file mode 100644 index 6563edc2d0..0000000000 --- a/mappings/net/minecraft/client/gui/NavigationType.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_8015 net/minecraft/client/gui/NavigationType - METHOD method_48182 isMouse ()Z - METHOD method_48183 isKeyboard ()Z diff --git a/mappings/net/minecraft/client/gui/ParentElement.mapping b/mappings/net/minecraft/client/gui/ParentElement.mapping index c0defaa627..58ba4ddc77 100644 --- a/mappings/net/minecraft/client/gui/ParentElement.mapping +++ b/mappings/net/minecraft/client/gui/ParentElement.mapping @@ -18,3 +18,21 @@ CLASS net/minecraft/class_4069 net/minecraft/client/gui/ParentElement METHOD method_25398 setDragging (Z)V ARG 1 dragging METHOD method_25399 getFocused ()Lnet/minecraft/class_364; + METHOD method_48214 computeNavigationPath (Lnet/minecraft/class_8023$class_8024;)Lnet/minecraft/class_8016; + ARG 1 navigation + METHOD method_48215 computeNavigationPath (Lnet/minecraft/class_8023$class_8026;)Lnet/minecraft/class_8016; + ARG 1 navigation + METHOD method_48216 (Lnet/minecraft/class_8028;Lnet/minecraft/class_364;)Ljava/lang/Integer; + ARG 1 element + METHOD method_48217 computeChildPath (Lnet/minecraft/class_8030;Lnet/minecraft/class_8028;Lnet/minecraft/class_364;Lnet/minecraft/class_8023;)Lnet/minecraft/class_8016; + ARG 1 focus + ARG 2 direction + ARG 3 focused + ARG 4 navigation + METHOD method_48219 (Lnet/minecraft/class_8028;Lnet/minecraft/class_364;)Ljava/lang/Integer; + ARG 1 element + METHOD method_48220 computeInitialChildPath (Lnet/minecraft/class_8030;Lnet/minecraft/class_8028;Lnet/minecraft/class_364;Lnet/minecraft/class_8023;)Lnet/minecraft/class_8016; + ARG 1 focus + ARG 2 direction + ARG 3 focused + ARG 4 navigation diff --git a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping index 0d45e5cd2d..689bfd52c6 100644 --- a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping @@ -55,6 +55,8 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud ARG 1 heartCount METHOD method_1734 getRiddenEntity ()Lnet/minecraft/class_1309; METHOD method_1735 renderVignetteOverlay (Lnet/minecraft/class_4587;Lnet/minecraft/class_1297;)V + ARG 1 matrices + ARG 2 entity METHOD method_1736 renderCrosshair (Lnet/minecraft/class_4587;)V ARG 1 matrices METHOD method_1737 getCameraPlayer ()Lnet/minecraft/class_1657; @@ -69,6 +71,8 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud ARG 1 entity METHOD method_1745 resetDebugHudChunk ()V METHOD method_1746 renderPortalOverlay (Lnet/minecraft/class_4587;F)V + ARG 1 matrices + ARG 2 nauseaStrength METHOD method_1747 clear ()V METHOD method_1748 tick ()V METHOD method_1749 renderHeldItemTooltip (Lnet/minecraft/class_4587;)V @@ -119,7 +123,12 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud ARG 4 width ARG 5 color METHOD method_31977 renderOverlay (Lnet/minecraft/class_4587;Lnet/minecraft/class_2960;F)V + ARG 1 matrices + ARG 2 texture + ARG 3 opacity METHOD method_32598 renderSpyglassOverlay (Lnet/minecraft/class_4587;F)V + ARG 1 matrices + ARG 2 scale METHOD method_34001 setTitleTicks (III)V ARG 1 fadeInTicks ARG 2 stayTicks diff --git a/mappings/net/minecraft/client/gui/hud/PlayerListHud.mapping b/mappings/net/minecraft/client/gui/hud/PlayerListHud.mapping index b342963473..ff18645f8b 100644 --- a/mappings/net/minecraft/client/gui/hud/PlayerListHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/PlayerListHud.mapping @@ -67,10 +67,17 @@ CLASS net/minecraft/class_355 net/minecraft/client/gui/hud/PlayerListHud ARG 6 score METHOD method_45591 (ILjava/util/UUID;)Lnet/minecraft/class_355$class_7732; ARG 1 uuid2 + METHOD method_45592 (Lnet/minecraft/class_640;)I + ARG 0 entry METHOD method_45593 (Ljava/util/Set;Ljava/util/UUID;)Z ARG 1 uuid METHOD method_45594 (Lnet/minecraft/class_640;)Ljava/util/UUID; ARG 0 playerEntry + METHOD method_45595 (Lnet/minecraft/class_640;)Ljava/lang/String; + ARG 0 entry + METHOD method_46511 (Lnet/minecraft/class_640;)Ljava/lang/String; + ARG 0 entry + METHOD method_48213 collectPlayerEntries ()Ljava/util/List; CLASS class_7732 Heart FIELD field_40394 COOLDOWN_TICKS J FIELD field_40395 SCORE_DECREASE_HIGHLIGHT_TICKS J diff --git a/mappings/net/minecraft/client/gui/navigation/FocusedPos.mapping b/mappings/net/minecraft/client/gui/navigation/FocusedPos.mapping new file mode 100644 index 0000000000..6dc9bdd2f7 --- /dev/null +++ b/mappings/net/minecraft/client/gui/navigation/FocusedPos.mapping @@ -0,0 +1,10 @@ +CLASS net/minecraft/class_8029 net/minecraft/client/gui/navigation/FocusedPos + COMMENT Represents the position of an {@link FocusedRect}. + METHOD method_48245 getComponent (Lnet/minecraft/class_8027;)I + ARG 1 axis + METHOD method_48246 of (Lnet/minecraft/class_8027;II)Lnet/minecraft/class_8029; + ARG 0 axis + ARG 1 sameAxis + ARG 2 otherAxis + METHOD method_48247 add (Lnet/minecraft/class_8028;)Lnet/minecraft/class_8029; + ARG 1 direction diff --git a/mappings/net/minecraft/client/gui/navigation/FocusedRect.mapping b/mappings/net/minecraft/client/gui/navigation/FocusedRect.mapping new file mode 100644 index 0000000000..51c3722990 --- /dev/null +++ b/mappings/net/minecraft/client/gui/navigation/FocusedRect.mapping @@ -0,0 +1,45 @@ +CLASS net/minecraft/class_8030 net/minecraft/client/gui/navigation/FocusedRect + COMMENT A rectangle on the screen that is focused. + FIELD field_41835 EMPTY Lnet/minecraft/class_8030; + METHOD (IIII)V + ARG 1 sameAxis + ARG 2 otherAxis + ARG 3 width + ARG 4 height + METHOD method_48248 empty ()Lnet/minecraft/class_8030; + COMMENT {@return an empty rect} + METHOD method_48249 getLength (Lnet/minecraft/class_8027;)I + COMMENT {@return the length of the rect in the given {@code axis}} + ARG 1 axis + METHOD method_48250 of (Lnet/minecraft/class_8027;IIII)Lnet/minecraft/class_8030; + COMMENT {@return a new rect} + ARG 0 axis + ARG 1 sameAxisCoord + COMMENT the coordinate of the {@code axis} axis + ARG 2 otherAxisCoord + COMMENT the coordinate of the {@code axis}'s other axis + ARG 3 sameAxisLength + COMMENT the length of the edge whose axis is the same as {@code axis} + ARG 4 otherAxisLength + COMMENT the length of the edge whose axis is different from {@code axis} + METHOD method_48251 add (Lnet/minecraft/class_8028;)Lnet/minecraft/class_8030; + COMMENT {@return a new rect of the same dimensions with the position incremented} + ARG 1 direction + METHOD method_48252 overlaps (Lnet/minecraft/class_8030;)Z + COMMENT {@return whether this rect overlaps with {@code rect} in both axes} + ARG 1 other + METHOD method_48253 overlaps (Lnet/minecraft/class_8030;Lnet/minecraft/class_8027;)Z + COMMENT {@return whether this rect overlaps with {@code rect} in {@code axis}} + ARG 1 other + ARG 2 axis + METHOD method_48254 getCenter (Lnet/minecraft/class_8027;)I + COMMENT {@return the center of this rect in the given {@code axis}} + ARG 1 axis + METHOD method_48255 getBoundingCoordinate (Lnet/minecraft/class_8028;)I + COMMENT {@return the coordinate of the bounding box in the given {@code direction}} + ARG 1 direction + METHOD method_48256 getBorder (Lnet/minecraft/class_8028;)Lnet/minecraft/class_8030; + COMMENT {@return a rect representing the border of this rect in the given {@code direction}} + COMMENT + COMMENT

Borders are one pixel thick. + ARG 1 direction diff --git a/mappings/net/minecraft/client/gui/navigation/GuiNavigation.mapping b/mappings/net/minecraft/client/gui/navigation/GuiNavigation.mapping new file mode 100644 index 0000000000..3deaa86423 --- /dev/null +++ b/mappings/net/minecraft/client/gui/navigation/GuiNavigation.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_8023 net/minecraft/client/gui/navigation/GuiNavigation + COMMENT Represents a directional navigation initiated by keyboard. + METHOD method_48231 getDirection ()Lnet/minecraft/class_8028; + CLASS class_8024 Arrow + CLASS class_8025 Down + CLASS class_8026 Tab diff --git a/mappings/net/minecraft/client/gui/navigation/GuiNavigationPath.mapping b/mappings/net/minecraft/client/gui/navigation/GuiNavigationPath.mapping new file mode 100644 index 0000000000..54e4ff33f7 --- /dev/null +++ b/mappings/net/minecraft/client/gui/navigation/GuiNavigationPath.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/class_8016 net/minecraft/client/gui/navigation/GuiNavigationPath + COMMENT Represents a path of currently navigating elements from the root element + COMMENT to the leaf. + METHOD method_48192 of (Lnet/minecraft/class_4069;Lnet/minecraft/class_8016;)Lnet/minecraft/class_8016; + ARG 0 element + ARG 1 childPath + METHOD method_48193 of (Lnet/minecraft/class_364;)Lnet/minecraft/class_8016; + ARG 0 leaf + METHOD method_48194 of (Lnet/minecraft/class_364;[Lnet/minecraft/class_4069;)Lnet/minecraft/class_8016; + ARG 0 leaf + ARG 1 elements + METHOD method_48195 setFocused (Z)V + COMMENT Sets whether the path is focused. This propagates to children. + ARG 1 focused + CLASS class_8017 Leaf + CLASS class_8018 IntermediaryNode diff --git a/mappings/net/minecraft/client/gui/navigation/GuiNavigationType.mapping b/mappings/net/minecraft/client/gui/navigation/GuiNavigationType.mapping new file mode 100644 index 0000000000..a2332f90d5 --- /dev/null +++ b/mappings/net/minecraft/client/gui/navigation/GuiNavigationType.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_8015 net/minecraft/client/gui/navigation/GuiNavigationType + COMMENT An enum representing the type of navigation input method. + METHOD method_48182 isMouse ()Z + METHOD method_48183 isKeyboard ()Z diff --git a/mappings/net/minecraft/client/gui/screen/NavigationAxis.mapping b/mappings/net/minecraft/client/gui/navigation/NavigationAxis.mapping similarity index 77% rename from mappings/net/minecraft/client/gui/screen/NavigationAxis.mapping rename to mappings/net/minecraft/client/gui/navigation/NavigationAxis.mapping index b49cb77488..ad67efee47 100644 --- a/mappings/net/minecraft/client/gui/screen/NavigationAxis.mapping +++ b/mappings/net/minecraft/client/gui/navigation/NavigationAxis.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_8027 net/minecraft/client/gui/screen/NavigationAxis +CLASS net/minecraft/class_8027 net/minecraft/client/gui/navigation/NavigationAxis METHOD method_48232 getOther ()Lnet/minecraft/class_8027; METHOD method_48233 getDirection (Z)Lnet/minecraft/class_8028; ARG 1 positive diff --git a/mappings/net/minecraft/client/gui/navigation/NavigationDirection.mapping b/mappings/net/minecraft/client/gui/navigation/NavigationDirection.mapping new file mode 100644 index 0000000000..7da24f1d74 --- /dev/null +++ b/mappings/net/minecraft/client/gui/navigation/NavigationDirection.mapping @@ -0,0 +1,30 @@ +CLASS net/minecraft/class_8028 net/minecraft/client/gui/navigation/NavigationDirection + FIELD field_41830 comparator Lit/unimi/dsi/fastutil/ints/IntComparator; + METHOD method_48237 getAxis ()Lnet/minecraft/class_8027; + METHOD method_48238 isAfter (II)Z + COMMENT {@return whether the coordinate {@code a} comes after {@code b}} + COMMENT + COMMENT

For example, if navigating downwards, {@code 2} comes after {@code 1}, + COMMENT while the opposite is true if navigating upwards. This always returns + COMMENT {@code false} if two arguments are equal. + COMMENT + COMMENT @see #isBefore + ARG 1 a + ARG 2 b + METHOD method_48239 getOpposite ()Lnet/minecraft/class_8028; + METHOD method_48240 isBefore (II)Z + COMMENT {@return whether the coordinate {@code a} comes before {@code b}} + COMMENT + COMMENT

For example, if navigating downwards, {@code 1} comes before {@code 2}, + COMMENT while the opposite is true if navigating upwards. This always returns + COMMENT {@code false} if two arguments are equal. + COMMENT + COMMENT @see #isAfter + ARG 1 a + ARG 2 b + METHOD method_48241 isPositive ()Z + METHOD method_48242 (II)I + ARG 1 a + ARG 2 b + METHOD method_48243 getComparator ()Lit/unimi/dsi/fastutil/ints/IntComparator; + COMMENT {@return the comparator that sorts the coordinates in ascending order} diff --git a/mappings/net/minecraft/client/gui/screen/NavigationDirection.mapping b/mappings/net/minecraft/client/gui/screen/NavigationDirection.mapping deleted file mode 100644 index b7f9313e04..0000000000 --- a/mappings/net/minecraft/client/gui/screen/NavigationDirection.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_8028 net/minecraft/client/gui/screen/NavigationDirection - METHOD method_48237 getAxis ()Lnet/minecraft/class_8027; - METHOD method_48239 getOpposite ()Lnet/minecraft/class_8028; - METHOD method_48241 isPositive ()Z diff --git a/mappings/net/minecraft/client/gui/screen/Screen.mapping b/mappings/net/minecraft/client/gui/screen/Screen.mapping index ba2fe5bc46..239f99fae1 100644 --- a/mappings/net/minecraft/client/gui/screen/Screen.mapping +++ b/mappings/net/minecraft/client/gui/screen/Screen.mapping @@ -65,7 +65,7 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen COMMENT Renders the background of this screen. COMMENT COMMENT

If the client is in a world, renders the translucent background gradient. - COMMENT Otherwise {@linkplain #renderBackgroundTexture(int) renders the background texture}. + COMMENT Otherwise {@linkplain #renderBackgroundTexture renders the background texture}. ARG 1 matrices METHOD method_25421 shouldPause ()Z METHOD method_25422 shouldCloseOnEsc ()Z @@ -83,6 +83,8 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen COMMENT Called when a screen should be initialized. COMMENT COMMENT

This method is called when this screen is {@linkplain net.minecraft.client.MinecraftClient#setScreen(Screen) opened} or resized. + COMMENT + COMMENT

This should call {@link #setInitialFocus} to set the element that is initially focused. METHOD method_25428 confirmLink (Z)V ARG 1 open METHOD method_25429 addSelectableChild (Lnet/minecraft/class_364;)Lnet/minecraft/class_364; @@ -195,6 +197,17 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen ARG 7 colorStart ARG 8 colorEnd METHOD method_48262 hasUsageText ()Z + METHOD method_48263 switchFocus (Lnet/minecraft/class_8016;)V + COMMENT Switches focus from the currently focused element, if any, to {@code path}. + ARG 1 path + METHOD method_48264 getArrowNavigation (Lnet/minecraft/class_8028;)Lnet/minecraft/class_8023$class_8024; + ARG 1 direction + METHOD method_48265 setInitialFocus (Lnet/minecraft/class_364;)V + COMMENT Sets the initial focus of this screen. This should be called inside the overridden + COMMENT {@link #init()} method by screen implementations. + ARG 1 element + METHOD method_48266 getTabNavigation ()Lnet/minecraft/class_8023$class_8026; + METHOD method_48267 blur ()V CLASS class_6390 SelectedElementNarrationData FIELD field_33825 selectable Lnet/minecraft/class_6379; FIELD field_33826 index I diff --git a/mappings/net/minecraft/client/gui/screen/option/ControlsListWidget.mapping b/mappings/net/minecraft/client/gui/screen/option/ControlsListWidget.mapping index 9cdc31f412..10b91990f8 100644 --- a/mappings/net/minecraft/client/gui/screen/option/ControlsListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/ControlsListWidget.mapping @@ -10,6 +10,7 @@ CLASS net/minecraft/class_459 net/minecraft/client/gui/screen/option/ControlsLis METHOD (Lnet/minecraft/class_459;Lnet/minecraft/class_2561;)V ARG 2 text CLASS class_461 Entry + METHOD method_48269 update ()V CLASS class_462 KeyBindingEntry FIELD field_2739 editButton Lnet/minecraft/class_4185; FIELD field_2740 binding Lnet/minecraft/class_304; @@ -22,3 +23,7 @@ CLASS net/minecraft/class_459 net/minecraft/client/gui/screen/option/ControlsLis ARG 2 button METHOD method_19871 (Lnet/minecraft/class_304;Lnet/minecraft/class_4185;)V ARG 2 button + METHOD method_46514 (Lnet/minecraft/class_304;Lnet/minecraft/class_2561;Ljava/util/function/Supplier;)Lnet/minecraft/class_5250; + ARG 2 textSupplier + METHOD method_46515 (Lnet/minecraft/class_2561;Ljava/util/function/Supplier;)Lnet/minecraft/class_5250; + ARG 1 textSupplier diff --git a/mappings/net/minecraft/client/gui/screen/option/KeybindsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/KeybindsScreen.mapping index 9545e96cdd..df0e297887 100644 --- a/mappings/net/minecraft/client/gui/screen/option/KeybindsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/KeybindsScreen.mapping @@ -10,3 +10,4 @@ CLASS net/minecraft/class_6599 net/minecraft/client/gui/screen/option/KeybindsSc ARG 1 button METHOD method_38532 (Lnet/minecraft/class_4185;)V ARG 1 button + METHOD method_48270 update ()V diff --git a/mappings/net/minecraft/client/gui/screen/option/TelemetryEventWidget.mapping b/mappings/net/minecraft/client/gui/screen/option/TelemetryEventWidget.mapping index 438aaf5261..3af406cb2f 100644 --- a/mappings/net/minecraft/client/gui/screen/option/TelemetryEventWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/TelemetryEventWidget.mapping @@ -25,6 +25,8 @@ CLASS net/minecraft/class_7941 net/minecraft/client/gui/screen/option/TelemetryE METHOD method_47639 collectContents (Z)Lnet/minecraft/class_7941$class_7942; ARG 1 optionalTelemetryEnabled METHOD method_47640 getGridWidth ()I + METHOD method_48285 (Lnet/minecraft/class_4587;IIFLnet/minecraft/class_339;)V + ARG 4 widget CLASS class_7942 Contents FIELD comp_1160 grid Lnet/minecraft/class_7845; METHOD comp_1160 grid ()Lnet/minecraft/class_7845; diff --git a/mappings/net/minecraft/client/gui/screen/pack/PackScreen.mapping b/mappings/net/minecraft/client/gui/screen/pack/PackScreen.mapping index 4054576cbf..a8afbb7fdc 100644 --- a/mappings/net/minecraft/client/gui/screen/pack/PackScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/pack/PackScreen.mapping @@ -47,6 +47,9 @@ CLASS net/minecraft/class_5375 net/minecraft/client/gui/screen/pack/PackScreen ARG 1 textureManager ARG 2 resourcePackProfile METHOD method_30291 closeDirectoryWatcher ()V + METHOD method_48277 switchFocusedList (Lnet/minecraft/class_5369$class_5371;Lnet/minecraft/class_521;)V + ARG 1 pack + ARG 2 listWidget METHOD method_48278 clearSelection ()V CLASS class_5426 DirectoryWatcher FIELD field_25790 watchService Ljava/nio/file/WatchService; diff --git a/mappings/net/minecraft/client/gui/widget/AxisGridWidget.mapping b/mappings/net/minecraft/client/gui/widget/AxisGridWidget.mapping index 15cfa35e9d..01068b8841 100644 --- a/mappings/net/minecraft/client/gui/widget/AxisGridWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/AxisGridWidget.mapping @@ -13,13 +13,18 @@ CLASS net/minecraft/class_7849 net/minecraft/client/gui/widget/AxisGridWidget ARG 2 height ARG 3 axis METHOD method_46495 add (Lnet/minecraft/class_8021;)Lnet/minecraft/class_8021; + ARG 1 widget METHOD method_46496 add (Lnet/minecraft/class_8021;Lnet/minecraft/class_7847;)Lnet/minecraft/class_8021; + ARG 1 widget ARG 2 positioner METHOD method_46499 copyPositioner ()Lnet/minecraft/class_7847; METHOD method_46500 getMainPositioner ()Lnet/minecraft/class_7847; + METHOD method_48230 (Ljava/util/function/Consumer;Lnet/minecraft/class_7849$class_7850;)V + ARG 1 element CLASS class_7850 Element CLASS class_7851 DisplayAxis METHOD method_46502 getSameAxisLength (Lnet/minecraft/class_8021;)I + ARG 1 widget METHOD method_46504 getSameAxisLength (Lnet/minecraft/class_7849$class_7850;)I ARG 1 element METHOD method_46505 setSameAxisCoordinate (Lnet/minecraft/class_7849$class_7850;I)V @@ -30,7 +35,10 @@ CLASS net/minecraft/class_7849 net/minecraft/client/gui/widget/AxisGridWidget ARG 2 low ARG 3 high METHOD method_46507 getOtherAxisLength (Lnet/minecraft/class_8021;)I + ARG 1 widget METHOD method_46508 getOtherAxisLength (Lnet/minecraft/class_7849$class_7850;)I ARG 1 element METHOD method_46509 getSameAxisCoordinate (Lnet/minecraft/class_8021;)I + ARG 1 widget METHOD method_46510 getOtherAxisCoordinate (Lnet/minecraft/class_8021;)I + ARG 1 widget diff --git a/mappings/net/minecraft/client/gui/widget/ElementListWidget.mapping b/mappings/net/minecraft/client/gui/widget/ElementListWidget.mapping index 63957bb94b..cbe9e99db6 100644 --- a/mappings/net/minecraft/client/gui/widget/ElementListWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/ElementListWidget.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_4265 net/minecraft/client/gui/widget/ElementListWidget + METHOD method_48207 (Lnet/minecraft/class_4265$class_4266;)Z + ARG 0 element CLASS class_4266 Entry FIELD field_19077 focused Lnet/minecraft/class_364; FIELD field_19078 dragging Z @@ -6,3 +8,6 @@ CLASS net/minecraft/class_4265 net/minecraft/client/gui/widget/ElementListWidget METHOD method_37024 appendNarrations (Lnet/minecraft/class_6382;)V ARG 1 builder METHOD method_37025 selectableChildren ()Ljava/util/List; + METHOD method_48208 getNavigationPath (Lnet/minecraft/class_8023;I)Lnet/minecraft/class_8016; + ARG 1 navigation + ARG 2 index diff --git a/mappings/net/minecraft/client/gui/widget/EmptyWidget.mapping b/mappings/net/minecraft/client/gui/widget/EmptyWidget.mapping index 69f2fd2c98..ef1aedb756 100644 --- a/mappings/net/minecraft/client/gui/widget/EmptyWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/EmptyWidget.mapping @@ -1,4 +1,8 @@ CLASS net/minecraft/class_7852 net/minecraft/client/gui/widget/EmptyWidget + FIELD field_41818 x I + FIELD field_41819 y I + FIELD field_41820 width I + FIELD field_41821 height I METHOD (II)V ARG 1 width ARG 2 height diff --git a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping index c9d06b2636..76c244c04e 100644 --- a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping @@ -130,6 +130,18 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget ARG 1 entry METHOD method_44650 removeEntryWithoutScrolling (Lnet/minecraft/class_350$class_351;)Z ARG 1 entry + METHOD method_48197 getNeighboringEntry (Lnet/minecraft/class_8028;)Lnet/minecraft/class_350$class_351; + ARG 1 direction + METHOD method_48198 getNeighboringEntry (Lnet/minecraft/class_8028;Ljava/util/function/Predicate;)Lnet/minecraft/class_350$class_351; + ARG 1 direction + ARG 2 predicate + METHOD method_48199 getNeighboringEntry (Lnet/minecraft/class_8028;Ljava/util/function/Predicate;Lnet/minecraft/class_350$class_351;)Lnet/minecraft/class_350$class_351; + ARG 1 direction + ARG 2 predicate + ARG 3 selected + METHOD method_48200 getFirst ()Lnet/minecraft/class_350$class_351; + METHOD method_48201 (Lnet/minecraft/class_350$class_351;)Z + ARG 0 entry CLASS class_351 Entry FIELD field_22752 parentList Lnet/minecraft/class_350; METHOD method_25343 render (Lnet/minecraft/class_4587;IIIIIIIZF)V diff --git a/mappings/net/minecraft/client/gui/widget/GridWidget.mapping b/mappings/net/minecraft/client/gui/widget/GridWidget.mapping index 85f1a57275..7c37b1998f 100644 --- a/mappings/net/minecraft/client/gui/widget/GridWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/GridWidget.mapping @@ -9,20 +9,24 @@ CLASS net/minecraft/class_7845 net/minecraft/client/gui/widget/GridWidget ARG 1 x ARG 2 y METHOD method_46452 add (Lnet/minecraft/class_8021;II)Lnet/minecraft/class_8021; + ARG 1 widget ARG 2 row ARG 3 column METHOD method_46453 add (Lnet/minecraft/class_8021;IIII)Lnet/minecraft/class_8021; + ARG 1 widget ARG 2 row ARG 3 column ARG 4 occupiedRows ARG 5 occupiedColumns METHOD method_46454 add (Lnet/minecraft/class_8021;IIIILnet/minecraft/class_7847;)Lnet/minecraft/class_8021; + ARG 1 widget ARG 2 row ARG 3 column ARG 4 occupiedRows ARG 5 occupiedColumns ARG 6 positioner METHOD method_46455 add (Lnet/minecraft/class_8021;IILnet/minecraft/class_7847;)Lnet/minecraft/class_8021; + ARG 1 widget ARG 2 row ARG 3 column ARG 4 positioner @@ -36,6 +40,7 @@ CLASS net/minecraft/class_7845 net/minecraft/client/gui/widget/GridWidget FIELD field_40776 occupiedRows I FIELD field_40777 occupiedColumns I METHOD (Lnet/minecraft/class_8021;IIIILnet/minecraft/class_7847;)V + ARG 1 widget ARG 2 row ARG 3 column ARG 4 occupiedRows @@ -50,11 +55,15 @@ CLASS net/minecraft/class_7845 net/minecraft/client/gui/widget/GridWidget ARG 2 columns METHOD method_47611 copyPositioner ()Lnet/minecraft/class_7847; METHOD method_47612 add (Lnet/minecraft/class_8021;)Lnet/minecraft/class_8021; + ARG 1 widget METHOD method_47613 add (Lnet/minecraft/class_8021;I)Lnet/minecraft/class_8021; + ARG 1 widget ARG 2 occupiedColumns METHOD method_47614 add (Lnet/minecraft/class_8021;ILnet/minecraft/class_7847;)Lnet/minecraft/class_8021; + ARG 1 widget ARG 2 occupiedColumns ARG 3 positioner METHOD method_47615 add (Lnet/minecraft/class_8021;Lnet/minecraft/class_7847;)Lnet/minecraft/class_8021; + ARG 1 widget ARG 2 positioner METHOD method_47616 getMainPositioner ()Lnet/minecraft/class_7847; diff --git a/mappings/net/minecraft/client/gui/widget/NarratedMultilineTextWidget.mapping b/mappings/net/minecraft/client/gui/widget/NarratedMultilineTextWidget.mapping index 2d5d1b6df0..4d8ca257ab 100644 --- a/mappings/net/minecraft/client/gui/widget/NarratedMultilineTextWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/NarratedMultilineTextWidget.mapping @@ -1,5 +1,10 @@ CLASS net/minecraft/class_8019 net/minecraft/client/gui/widget/NarratedMultilineTextWidget FIELD field_41798 title Lnet/minecraft/class_2561; + FIELD field_41799 FOCUSED_BORDER_COLOR I + FIELD field_41800 UNFOCUSED_BORDER_COLOR I + FIELD field_41801 BACKGROUND_COLOR I + FIELD field_41802 EXPANSION I + FIELD field_41803 BORDER_WIDTH I METHOD (Lnet/minecraft/class_327;Lnet/minecraft/class_2561;I)V ARG 1 textRenderer ARG 2 text diff --git a/mappings/net/minecraft/client/gui/widget/ScrollableWidget.mapping b/mappings/net/minecraft/client/gui/widget/ScrollableWidget.mapping index b95cedd6de..e985113de0 100644 --- a/mappings/net/minecraft/client/gui/widget/ScrollableWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/ScrollableWidget.mapping @@ -44,3 +44,4 @@ CLASS net/minecraft/class_7528 net/minecraft/client/gui/widget/ScrollableWidget METHOD method_44394 getScrollbarThumbHeight ()I METHOD method_44395 getContentsHeightWithPadding ()I METHOD method_44396 drawScrollbar (Lnet/minecraft/class_4587;)V + ARG 1 matrices diff --git a/mappings/net/minecraft/client/gui/widget/SimplePositioningWidget.mapping b/mappings/net/minecraft/client/gui/widget/SimplePositioningWidget.mapping index 21d5e1d174..cbf80a25ea 100644 --- a/mappings/net/minecraft/client/gui/widget/SimplePositioningWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/SimplePositioningWidget.mapping @@ -43,4 +43,6 @@ CLASS net/minecraft/class_7843 net/minecraft/client/gui/widget/SimplePositioning METHOD method_46449 setMinWidth (I)Lnet/minecraft/class_7843; ARG 1 minHeight METHOD method_46450 getMainPositioner ()Lnet/minecraft/class_7847; + METHOD method_48228 (Ljava/util/function/Consumer;Lnet/minecraft/class_7843$class_7844;)V + ARG 1 element CLASS class_7844 Element diff --git a/mappings/net/minecraft/client/gui/widget/SliderWidget.mapping b/mappings/net/minecraft/client/gui/widget/SliderWidget.mapping index 189090073a..cd65f528c6 100644 --- a/mappings/net/minecraft/client/gui/widget/SliderWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/SliderWidget.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_357 net/minecraft/client/gui/widget/SliderWidget FIELD field_22753 value D + FIELD field_41787 TEXTURE Lnet/minecraft/class_2960; + FIELD field_41796 sliderFocused Z METHOD (IIIILnet/minecraft/class_2561;D)V ARG 1 x ARG 2 y @@ -20,3 +22,4 @@ CLASS net/minecraft/class_357 net/minecraft/client/gui/widget/SliderWidget METHOD method_25347 setValue (D)V ARG 1 value COMMENT the new value; will be clamped to {@code [0, 1]} + METHOD method_48204 getTextureV ()I diff --git a/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping b/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping index 495b65daa9..94d85f5cc5 100644 --- a/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping @@ -97,6 +97,11 @@ CLASS net/minecraft/class_342 net/minecraft/client/gui/widget/TextFieldWidget ARG 1 index METHOD method_1885 isVisible ()Z METHOD method_1886 drawSelectionHighlight (Lnet/minecraft/class_4587;IIII)V + ARG 1 matrices + ARG 2 x1 + ARG 3 y1 + ARG 4 x2 + ARG 5 y2 METHOD method_1887 setSuggestion (Ljava/lang/String;)V ARG 1 suggestion METHOD method_1888 setEditable (Z)V diff --git a/mappings/net/minecraft/client/gui/widget/Widget.mapping b/mappings/net/minecraft/client/gui/widget/Widget.mapping index 8cae4cd826..3de8270847 100644 --- a/mappings/net/minecraft/client/gui/widget/Widget.mapping +++ b/mappings/net/minecraft/client/gui/widget/Widget.mapping @@ -7,6 +7,8 @@ CLASS net/minecraft/class_8021 net/minecraft/client/gui/widget/Widget ARG 1 x METHOD method_46426 getX ()I METHOD method_46427 getY ()I + METHOD method_48206 forEachChild (Ljava/util/function/Consumer;)V + ARG 1 consumer METHOD method_48229 setPosition (II)V ARG 1 x ARG 2 y diff --git a/mappings/net/minecraft/client/gui/widget/WrapperWidget.mapping b/mappings/net/minecraft/client/gui/widget/WrapperWidget.mapping index c2458e4d5e..6e03ba5f7c 100644 --- a/mappings/net/minecraft/client/gui/widget/WrapperWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/WrapperWidget.mapping @@ -8,6 +8,17 @@ CLASS net/minecraft/class_7838 net/minecraft/client/gui/widget/WrapperWidget ARG 2 y ARG 3 width ARG 4 height + METHOD method_48222 refreshPositions ()V + METHOD method_48223 (ILnet/minecraft/class_8021;)V + ARG 2 element + METHOD method_48224 (Lnet/minecraft/class_8021;)V + ARG 0 element + METHOD method_48225 (Ljava/util/function/Consumer;Lnet/minecraft/class_8021;)V + ARG 1 element + METHOD method_48226 (ILnet/minecraft/class_8021;)V + ARG 2 element + METHOD method_48227 forEachElement (Ljava/util/function/Consumer;)V + ARG 1 consumer CLASS class_7839 WrappedElement FIELD field_40752 widget Lnet/minecraft/class_8021; FIELD field_40753 positioner Lnet/minecraft/class_7847$class_7848; diff --git a/mappings/net/minecraft/client/option/GameOptions.mapping b/mappings/net/minecraft/client/option/GameOptions.mapping index 88240fd39e..f7341393b1 100644 --- a/mappings/net/minecraft/client/option/GameOptions.mapping +++ b/mappings/net/minecraft/client/option/GameOptions.mapping @@ -213,7 +213,9 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions FIELD field_41336 telemetryOptInExtra Lnet/minecraft/class_7172; FIELD field_41783 NOTIFICATION_DISPLAY_TIME_TOOLTIP Lnet/minecraft/class_2561; FIELD field_41784 notificationDisplayTime Lnet/minecraft/class_7172; + FIELD field_41785 onboardAccessibility Z METHOD (Lnet/minecraft/class_310;Ljava/io/File;)V + ARG 1 client ARG 2 optionsFile METHOD method_1626 update (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; ARG 1 nbt diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping index e91a72f73a..2fc82c3e4b 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping @@ -228,6 +228,25 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain ARG 1 pendingInvitesCount METHOD method_44615 (Ljava/util/List;)V ARG 1 servers + METHOD method_48170 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_48171 addInvitesAndNewsButtons ()V + METHOD method_48172 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_48173 addPurchaseButtons ()V + METHOD method_48174 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_48175 addPlayButtons ()V + METHOD method_48176 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_48177 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_48178 (Lnet/minecraft/class_4185;)V + ARG 0 button + METHOD method_48179 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_48180 (Lnet/minecraft/class_4185;)V + ARG 1 button CLASS class_4326 CloseButton METHOD method_25021 (Lnet/minecraft/class_4325;Lnet/minecraft/class_4185;)V ARG 1 button diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectFileToUploadScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectFileToUploadScreen.mapping index b924b69267..b340afe723 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectFileToUploadScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsSelectFileToUploadScreen.mapping @@ -29,6 +29,8 @@ CLASS net/minecraft/class_4416 net/minecraft/client/realms/gui/screen/RealmsSele ARG 1 button METHOD method_38508 (Lnet/minecraft/class_4185;)V ARG 1 button + METHOD method_48181 (Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583; + ARG 0 style CLASS class_4417 WorldListEntry FIELD field_22718 summary Lnet/minecraft/class_34; FIELD field_26509 displayName Ljava/lang/String; diff --git a/mappings/net/minecraft/client/resource/language/LanguageDefinition.mapping b/mappings/net/minecraft/client/resource/language/LanguageDefinition.mapping index 3cb7cdf37c..61a98c805f 100644 --- a/mappings/net/minecraft/client/resource/language/LanguageDefinition.mapping +++ b/mappings/net/minecraft/client/resource/language/LanguageDefinition.mapping @@ -1,14 +1,12 @@ CLASS net/minecraft/class_1077 net/minecraft/client/resource/language/LanguageDefinition - FIELD comp_1198 region Ljava/lang/String; - FIELD comp_1199 name Ljava/lang/String; FIELD comp_1200 rightToLeft Z FIELD field_41862 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/lang/String;Ljava/lang/String;Z)V ARG 1 code ARG 2 region - METHOD comp_1198 region ()Ljava/lang/String; - METHOD comp_1199 name ()Ljava/lang/String; METHOD comp_1200 rightToLeft ()Z METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_48303 getDisplayText ()Lnet/minecraft/class_2561; + METHOD method_48304 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/datafixer/DataFixTypes.mapping b/mappings/net/minecraft/datafixer/DataFixTypes.mapping index 7a4fedb1ae..958dfd875b 100644 --- a/mappings/net/minecraft/datafixer/DataFixTypes.mapping +++ b/mappings/net/minecraft/datafixer/DataFixTypes.mapping @@ -17,14 +17,14 @@ CLASS net/minecraft/class_4284 net/minecraft/datafixer/DataFixTypes METHOD method_48130 update (Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_2487;I)Lnet/minecraft/class_2487; COMMENT {@return {@code nbt} updated from {@code oldVersion} to the current version} COMMENT - COMMENT @see NbtHelper#getDataVersion + COMMENT @see net.minecraft.nbt.NbtHelper#getDataVersion ARG 1 dataFixer ARG 2 nbt ARG 3 oldVersion METHOD method_48131 update (Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_2487;II)Lnet/minecraft/class_2487; COMMENT {@return {@code nbt} updated from {@code oldVersion} to {@code newVersion}} COMMENT - COMMENT @see NbtHelper#getDataVersion + COMMENT @see net.minecraft.nbt.NbtHelper#getDataVersion ARG 1 dataFixer ARG 2 nbt ARG 3 oldVersion diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index ad1586d993..aa2db44c77 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -325,6 +325,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT COMMENT @see #requestTeleportAndDismount COMMENT @see #requestTeleport + COMMENT @see #teleport(ServerWorld, double, double, double, Set, float, float) COMMENT @see #refreshPositionAndAngles(double, double, double, float, float) ARG 1 destX ARG 3 destY @@ -719,7 +720,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT Requests the entity to teleport to the given position. If the entity is COMMENT a player, this also dismounts the player. COMMENT - COMMENT @see #teleport + COMMENT @see #teleport(double, double, double) + COMMENT @see #teleport(ServerWorld, double, double, double, Set, float, float) COMMENT @see #requestTeleport COMMENT @see #refreshPositionAndAngles(double, double, double, float, float) ARG 1 destX @@ -751,7 +753,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT For living entities, {@link #refreshPositionAndAngles} should be used instead. COMMENT COMMENT @see #refreshPositionAndAngles - COMMENT @see #teleport + COMMENT @see #teleport(double, double, double) ARG 1 pos METHOD method_33724 isRegionUnloaded ()Z COMMENT {@return whether any part of this entity's bounding box is in an unloaded @@ -923,6 +925,22 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 tickDelta METHOD method_46395 extinguishWithSound ()V METHOD method_46396 reinitDimensions ()V + METHOD method_48105 teleport (Lnet/minecraft/class_3218;DDDLjava/util/Set;FF)Z + COMMENT Teleports the entity to the given position. If {@code world} differs from + COMMENT the current world, it copies the entity and discards the current one. + COMMENT + COMMENT @see #requestTeleportAndDismount + COMMENT @see #requestTeleport + COMMENT @see #teleport(double, double, double) + COMMENT @see #refreshPositionAndAngles(double, double, double, float, float) + ARG 1 world + ARG 2 destX + ARG 4 destY + ARG 6 destZ + ARG 8 flags + ARG 9 yaw + ARG 10 pitch + METHOD method_48155 canSprintAsVehicle ()Z METHOD method_5621 getMountedHeightOffset ()D METHOD method_5622 onBlockCollision (Lnet/minecraft/class_2680;)V COMMENT Called when this entity's collision box intersects {@code state}. @@ -1889,7 +1907,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT For living entities, {@link #refreshPositionAndAngles} should be used instead. COMMENT COMMENT @see #refreshPositionAndAngles - COMMENT @see #teleport + COMMENT @see #teleport(double, double, double) ARG 1 x ARG 3 y ARG 5 z @@ -2105,7 +2123,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT

For players, this sends the teleport packet. For other entities, COMMENT this just sets the position of the entity and its passengers. COMMENT - COMMENT @see #teleport + COMMENT @see #teleport(double, double, double) + COMMENT @see #teleport(ServerWorld, double, double, double, Set, float, float) COMMENT @see #requestTeleportOffset(double, double, double) COMMENT @see #requestTeleportAndDismount COMMENT @see #refreshPositionAndAngles(double, double, double, float, float) diff --git a/mappings/net/minecraft/entity/ai/pathing/EntityNavigation.mapping b/mappings/net/minecraft/entity/ai/pathing/EntityNavigation.mapping index 6ff2004e5e..19afd4ce27 100644 --- a/mappings/net/minecraft/entity/ai/pathing/EntityNavigation.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/EntityNavigation.mapping @@ -65,6 +65,8 @@ CLASS net/minecraft/class_1408 net/minecraft/entity/ai/pathing/EntityNavigation ARG 1 startPos ARG 2 entityPos ARG 3 includeFluids + METHOD method_48158 canJumpToNext (Lnet/minecraft/class_7;)Z + ARG 1 nodeType METHOD method_6333 isValidPosition (Lnet/minecraft/class_2338;)Z ARG 1 pos METHOD method_6334 startMovingAlong (Lnet/minecraft/class_11;D)Z diff --git a/mappings/net/minecraft/entity/decoration/painting/PaintingEntity.mapping b/mappings/net/minecraft/entity/decoration/painting/PaintingEntity.mapping index 2a9016b6dc..13ef1889a6 100644 --- a/mappings/net/minecraft/entity/decoration/painting/PaintingEntity.mapping +++ b/mappings/net/minecraft/entity/decoration/painting/PaintingEntity.mapping @@ -21,7 +21,6 @@ CLASS net/minecraft/class_1534 net/minecraft/entity/decoration/painting/Painting ARG 1 variant METHOD method_43403 getSize (Lnet/minecraft/class_6880;)I ARG 0 variant - METHOD method_43404 getVariant ()Lnet/minecraft/class_6880; METHOD method_43405 getDefaultVariant ()Lnet/minecraft/class_6880; METHOD method_45378 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5321; ARG 0 id diff --git a/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping b/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping index 222a73bc90..17dbc08dd8 100644 --- a/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping @@ -50,7 +50,6 @@ CLASS net/minecraft/class_5762 net/minecraft/entity/passive/AxolotlEntity ARG 0 random METHOD method_33223 buffPlayer (Lnet/minecraft/class_1657;)V ARG 1 player - METHOD method_33225 getVariant ()Lnet/minecraft/class_5762$class_5767; METHOD method_33226 isPlayingDead ()Z METHOD method_33227 createAxolotlAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_33230 tickAir (I)V diff --git a/mappings/net/minecraft/entity/passive/CamelEntity.mapping b/mappings/net/minecraft/entity/passive/CamelEntity.mapping index d5419545c6..d85af493af 100644 --- a/mappings/net/minecraft/entity/passive/CamelEntity.mapping +++ b/mappings/net/minecraft/entity/passive/CamelEntity.mapping @@ -29,6 +29,9 @@ CLASS net/minecraft/class_7689 net/minecraft/entity/passive/CamelEntity METHOD method_45362 setDashing (Z)V ARG 1 dashing METHOD method_46398 shouldPlaySittingTransitionAnimation ()Z + METHOD method_48159 clampHeadYaw (Lnet/minecraft/class_1297;F)V + ARG 1 entity + ARG 2 range METHOD method_48160 initLastPoseTick (J)V ARG 1 time CLASS class_7690 CamelBodyControl diff --git a/mappings/net/minecraft/entity/passive/FrogEntity.mapping b/mappings/net/minecraft/entity/passive/FrogEntity.mapping index 221b049c59..f38b9bb9b2 100644 --- a/mappings/net/minecraft/entity/passive/FrogEntity.mapping +++ b/mappings/net/minecraft/entity/passive/FrogEntity.mapping @@ -15,7 +15,6 @@ CLASS net/minecraft/class_7102 net/minecraft/entity/passive/FrogEntity ARG 1 entity METHOD method_41353 setVariant (Lnet/minecraft/class_7106;)V ARG 1 variant - METHOD method_41354 getVariant ()Lnet/minecraft/class_7106; METHOD method_41355 createFrogAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_41356 shouldWalk ()Z METHOD method_41357 shouldSwim ()Z diff --git a/mappings/net/minecraft/entity/passive/HorseEntity.mapping b/mappings/net/minecraft/entity/passive/HorseEntity.mapping index 81c2c4ff97..f99a07250d 100644 --- a/mappings/net/minecraft/entity/passive/HorseEntity.mapping +++ b/mappings/net/minecraft/entity/passive/HorseEntity.mapping @@ -6,7 +6,6 @@ CLASS net/minecraft/class_1498 net/minecraft/entity/passive/HorseEntity METHOD method_27076 setHorseVariant (Lnet/minecraft/class_5149;Lnet/minecraft/class_5148;)V ARG 1 color ARG 2 marking - METHOD method_27077 getColor ()Lnet/minecraft/class_5149; METHOD method_27078 getMarking ()Lnet/minecraft/class_5148; METHOD method_6783 setHorseVariant (I)V ARG 1 variant diff --git a/mappings/net/minecraft/entity/passive/LlamaEntity.mapping b/mappings/net/minecraft/entity/passive/LlamaEntity.mapping index 8dd96ba252..77c0105310 100644 --- a/mappings/net/minecraft/entity/passive/LlamaEntity.mapping +++ b/mappings/net/minecraft/entity/passive/LlamaEntity.mapping @@ -30,7 +30,6 @@ CLASS net/minecraft/class_1501 net/minecraft/entity/passive/LlamaEntity METHOD method_6807 isTrader ()Z METHOD method_6808 setSpit (Z)V ARG 1 spit - METHOD method_6809 getVariant ()Lnet/minecraft/class_1501$class_7993; CLASS class_1502 ChaseWolvesGoal METHOD (Lnet/minecraft/class_1501;)V ARG 1 llama diff --git a/mappings/net/minecraft/entity/passive/ParrotEntity.mapping b/mappings/net/minecraft/entity/passive/ParrotEntity.mapping index 7e62f8a190..6ef2ff9745 100644 --- a/mappings/net/minecraft/entity/passive/ParrotEntity.mapping +++ b/mappings/net/minecraft/entity/passive/ParrotEntity.mapping @@ -27,7 +27,6 @@ CLASS net/minecraft/class_1453 net/minecraft/entity/passive/ParrotEntity METHOD method_6583 getRandomSound (Lnet/minecraft/class_1937;Lnet/minecraft/class_5819;)Lnet/minecraft/class_3414; ARG 0 world ARG 1 random - METHOD method_6584 getVariant ()Lnet/minecraft/class_1453$class_7989; METHOD method_6586 getSound (Lnet/minecraft/class_1299;)Lnet/minecraft/class_3414; ARG 0 imitate METHOD method_6587 imitateNearbyMob (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;)Z diff --git a/mappings/net/minecraft/network/listener/PacketListener.mapping b/mappings/net/minecraft/network/listener/PacketListener.mapping index f2c6969e37..fe1206963a 100644 --- a/mappings/net/minecraft/network/listener/PacketListener.mapping +++ b/mappings/net/minecraft/network/listener/PacketListener.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_2547 net/minecraft/network/listener/PacketListener - COMMENT A packet listener listens to packets on a {@linkplain ClientConnection - COMMENT connection}. + COMMENT A packet listener listens to packets on a {@linkplain + COMMENT net.minecraft.network.ClientConnection connection}. COMMENT COMMENT

Its listener methods will be called on the netty event loop than the COMMENT client or server game engine threads. diff --git a/mappings/net/minecraft/server/command/DataCommand.mapping b/mappings/net/minecraft/server/command/DataCommand.mapping index 005403db34..306d99db5a 100644 --- a/mappings/net/minecraft/server/command/DataCommand.mapping +++ b/mappings/net/minecraft/server/command/DataCommand.mapping @@ -113,8 +113,12 @@ CLASS net/minecraft/class_3164 net/minecraft/server/command/DataCommand METHOD method_48091 getValues (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_3164$class_3167;)Ljava/util/List; ARG 0 context ARG 1 objectType + METHOD method_48092 (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ljava/lang/String; + ARG 1 value METHOD method_48093 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 nbt + METHOD method_48094 (Ljava/lang/String;)Ljava/lang/String; + ARG 0 value METHOD method_48095 mapValues (Ljava/util/List;Ljava/util/function/Function;)Ljava/util/List; ARG 0 list ARG 1 function @@ -125,6 +129,10 @@ CLASS net/minecraft/class_3164 net/minecraft/server/command/DataCommand METHOD method_48098 getValuesByPath (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_3164$class_3167;)Ljava/util/List; ARG 0 context ARG 1 objectType + METHOD method_48099 (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ljava/lang/String; + ARG 1 value + METHOD method_48100 (Ljava/lang/String;)Ljava/lang/String; + ARG 0 value METHOD method_48101 (Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3165;Lnet/minecraft/class_3164$class_3167;Lcom/mojang/brigadier/context/CommandContext;)I ARG 3 context METHOD method_48102 (Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3165;Lnet/minecraft/class_3164$class_3167;Lcom/mojang/brigadier/context/CommandContext;)I diff --git a/mappings/net/minecraft/util/dynamic/Codecs.mapping b/mappings/net/minecraft/util/dynamic/Codecs.mapping index f83a26e4c7..5d524f7e6d 100644 --- a/mappings/net/minecraft/util/dynamic/Codecs.mapping +++ b/mappings/net/minecraft/util/dynamic/Codecs.mapping @@ -20,7 +20,7 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs FIELD field_40725 GAME_PROFILE_PROPERTY_MAP Lcom/mojang/serialization/Codec; FIELD field_40726 GAME_PROFILE Lcom/mojang/serialization/Codec; FIELD field_40727 GAME_PROFILE_PROPERTY Lcom/mojang/serialization/Codec; - FIELD field_41759 STRING Lcom/mojang/serialization/Codec; + FIELD field_41759 NON_EMPTY_STRING Lcom/mojang/serialization/Codec; METHOD method_33817 xor (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; COMMENT Returns an exclusive-or codec for {@link Either} instances. COMMENT @@ -197,11 +197,15 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs ARG 0 optional METHOD method_46391 (Ljava/util/List;)Lorg/joml/Vector3f; ARG 0 list + METHOD method_48108 (FFLjava/util/function/Function;Ljava/lang/Float;)Lcom/mojang/serialization/DataResult; + ARG 3 value METHOD method_48109 string (II)Lcom/mojang/serialization/Codec; ARG 0 minLength ARG 1 maxLength METHOD method_48110 (IILjava/lang/String;)Lcom/mojang/serialization/DataResult; ARG 2 string + METHOD method_48111 (IILjava/util/function/Function;Ljava/lang/Integer;)Lcom/mojang/serialization/DataResult; + ARG 3 value METHOD method_48112 validate (Lcom/mojang/serialization/Codec;Ljava/util/function/Function;)Lcom/mojang/serialization/Codec; ARG 0 codec ARG 1 validator diff --git a/mappings/net/minecraft/util/math/Vec3i.mapping b/mappings/net/minecraft/util/math/Vec3i.mapping index 65191eefba..d9b0aad0ff 100644 --- a/mappings/net/minecraft/util/math/Vec3i.mapping +++ b/mappings/net/minecraft/util/math/Vec3i.mapping @@ -182,3 +182,5 @@ CLASS net/minecraft/class_2382 net/minecraft/util/math/Vec3i ARG 1 x ARG 3 y ARG 5 z + METHOD method_48305 (ILnet/minecraft/class_2382;)Lcom/mojang/serialization/DataResult; + ARG 1 vec diff --git a/mappings/net/minecraft/world/level/storage/LevelSummary.mapping b/mappings/net/minecraft/world/level/storage/LevelSummary.mapping index 3a687cf834..9f571e4734 100644 --- a/mappings/net/minecraft/world/level/storage/LevelSummary.mapping +++ b/mappings/net/minecraft/world/level/storage/LevelSummary.mapping @@ -37,6 +37,8 @@ CLASS net/minecraft/class_34 net/minecraft/world/level/storage/LevelSummary METHOD method_35505 getLevelInfo ()Lnet/minecraft/class_1940; METHOD method_38496 isVersionAvailable ()Z METHOD method_45554 isExperimental ()Z + METHOD method_48165 (Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583; + ARG 0 style CLASS class_5781 ConversionWarning FIELD field_28440 backup Z FIELD field_28441 boldRedFormatting Z