mirrors/yarn
mirrors
/
yarn
mirror of https://github.com/FabricMC/yarn.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

22w43a gui (#3371) 

* ButtonWidget Builder and more

* fix wrong class

* remove unnecessary thing

* ClickableWidget x y getter and setter

* missing method

* 22w43a GUI

* Some renames

* Delete GridBlockLengthIterator.mapping

Co-authored-by: RedLime <redlimerl@gmail.com>
This commit is contained in:
apple502j 2022-11-01 10:11:28 +09:00 committed by GitHub
parent 42584d9ec3
commit 8f027eb78b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 319 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mappings/net/minecraft/client/gui/hud/spectator/TeleportSpectatorMenu.mapping
View File

@ -7,3 +7,7 @@ CLASS net/minecraft/class_538 net/minecraft/client/gui/hud/spectator/TeleportSpe
ARG 1 entries
METHOD method_2785 (Lnet/minecraft/class_640;)Ljava/util/UUID;
ARG 0 a
METHOD method_46520 (Lnet/minecraft/class_640;)Lnet/minecraft/class_537;
ARG 0 entry
METHOD method_46521 (Lnet/minecraft/class_640;)Z
ARG 0 entry

2
mappings/net/minecraft/client/gui/screen/GameMenuScreen.mapping
View File

@ -26,3 +26,5 @@ CLASS net/minecraft/class_433 net/minecraft/client/gui/screen/GameMenuScreen
METHOD method_19845 (Lnet/minecraft/class_4185;)V
ARG 1 button
METHOD method_20543 initWidgets ()V
METHOD method_44451 (Lnet/minecraft/class_4185;)V
ARG 1 button

1
mappings/net/minecraft/client/gui/screen/option/VideoOptionsScreen.mapping
View File

@ -19,6 +19,7 @@ CLASS net/minecraft/class_446 net/minecraft/client/gui/screen/option/VideoOption
METHOD method_41844 (Lnet/minecraft/class_313;Lnet/minecraft/class_1041;Ljava/lang/Integer;)V
ARG 2 value
METHOD method_41845 (Lnet/minecraft/class_313;Lnet/minecraft/class_2561;Ljava/lang/Integer;)Lnet/minecraft/class_2561;
ARG 1 prefix
ARG 2 value
METHOD method_41846 getOptions (Lnet/minecraft/class_315;)[Lnet/minecraft/class_7172;
ARG 0 gameOptions

49
mappings/net/minecraft/client/gui/widget/AxisGridWidget.mapping Normal file
View File

@ -0,0 +1,49 @@
CLASS net/minecraft/class_7849 net/minecraft/client/gui/widget/AxisGridWidget
FIELD field_40784 axis Lnet/minecraft/class_7849$class_7851;
FIELD field_40785 elements Ljava/util/List;
FIELD field_40786 children Ljava/util/List;
FIELD field_40787 mainPositioner Lnet/minecraft/class_7847;
METHOD <init> (IIIILnet/minecraft/class_7849$class_7851;)V
ARG 1 x
ARG 2 y
ARG 3 width
ARG 4 height
ARG 5 axis
METHOD <init> (IILnet/minecraft/class_7849$class_7851;)V
ARG 1 width
ARG 2 height
ARG 3 axis
METHOD method_46495 add (Lnet/minecraft/class_339;)Lnet/minecraft/class_339;
ARG 1 widget
METHOD method_46496 add (Lnet/minecraft/class_339;Lnet/minecraft/class_7847;)Lnet/minecraft/class_339;
ARG 1 widget
ARG 2 positioner
METHOD method_46497 (Lnet/minecraft/class_7849$class_7850;)Lnet/minecraft/class_339;
ARG 0 element
METHOD method_46498 recalculateDimensions ()V
METHOD method_46499 copyPositioner ()Lnet/minecraft/class_7847;
METHOD method_46500 getMainPositioner ()Lnet/minecraft/class_7847;
CLASS class_7850 Element
CLASS class_7851 DisplayAxis
METHOD method_46502 getSameAxisLength (Lnet/minecraft/class_339;)I
ARG 1 widget
METHOD method_46503 setOtherAxisLength (Lnet/minecraft/class_339;I)V
ARG 1 widget
ARG 2 value
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
ARG 1 element
ARG 2 low
METHOD method_46506 setOtherAxisCoordinate (Lnet/minecraft/class_7849$class_7850;II)V
ARG 1 element
ARG 2 low
ARG 3 high
METHOD method_46507 getOtherAxisLength (Lnet/minecraft/class_339;)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_339;)I
ARG 1 widget
METHOD method_46510 getOtherAxisCoordinate (Lnet/minecraft/class_339;)I
ARG 1 widget

46
mappings/net/minecraft/client/gui/widget/ButtonWidget.mapping
View File

@ -1,7 +1,12 @@
CLASS net/minecraft/class_4185 net/minecraft/client/gui/widget/ButtonWidget
FIELD field_22767 onPress Lnet/minecraft/class_4185$class_4241;
FIELD field_25035 EMPTY Lnet/minecraft/class_4185$class_5316;
FIELD field_25035 EMPTY_TOOLTIP Lnet/minecraft/class_4185$class_5316;
FIELD field_25036 tooltipSupplier Lnet/minecraft/class_4185$class_5316;
FIELD field_39499 DEFAULT_WIDTH_SMALL I
FIELD field_39500 DEFAULT_WIDTH I
FIELD field_39501 DEFAULT_HEIGHT I
FIELD field_40754 DEFAULT_NARRATION_SUPPLIER Lnet/minecraft/class_4185$class_7841;
FIELD field_40755 narrationSupplier Lnet/minecraft/class_4185$class_7841;
METHOD <init> (IIIILnet/minecraft/class_2561;Lnet/minecraft/class_4185$class_4241;Lnet/minecraft/class_4185$class_5316;Lnet/minecraft/class_4185$class_7841;)V
ARG 1 x
ARG 2 y
@ -10,6 +15,7 @@ CLASS net/minecraft/class_4185 net/minecraft/client/gui/widget/ButtonWidget
ARG 5 message
ARG 6 onPress
ARG 7 tooltipSupplier
ARG 8 narrationSupplier
METHOD method_29045 (Lnet/minecraft/class_4185;Lnet/minecraft/class_4587;II)V
ARG 0 button
ARG 1 matrices
@ -17,6 +23,11 @@ CLASS net/minecraft/class_4185 net/minecraft/client/gui/widget/ButtonWidget
ARG 3 mouseY
METHOD method_37022 (Lnet/minecraft/class_6382;Lnet/minecraft/class_2561;)V
ARG 1 text
METHOD method_46429 (Ljava/util/function/Supplier;)Lnet/minecraft/class_5250;
ARG 0 textSupplier
METHOD method_46430 createBuilder (Lnet/minecraft/class_2561;Lnet/minecraft/class_4185$class_4241;)Lnet/minecraft/class_4185$class_7840;
ARG 0 message
ARG 1 onPress
CLASS class_4241 PressAction
METHOD onPress (Lnet/minecraft/class_4185;)V
ARG 1 button
@ -28,3 +39,36 @@ CLASS net/minecraft/class_4185 net/minecraft/client/gui/widget/ButtonWidget
ARG 2 matrices
ARG 3 mouseX
ARG 4 mouseY
CLASS class_7840 Builder
FIELD field_40756 message Lnet/minecraft/class_2561;
FIELD field_40757 onPress Lnet/minecraft/class_4185$class_4241;
FIELD field_40758 tooltipSupplier Lnet/minecraft/class_4185$class_5316;
FIELD field_40759 x I
FIELD field_40760 y I
FIELD field_40761 width I
FIELD field_40762 height I
FIELD field_40763 narrationSupplier Lnet/minecraft/class_4185$class_7841;
METHOD <init> (Lnet/minecraft/class_2561;Lnet/minecraft/class_4185$class_4241;)V
ARG 1 message
ARG 2 onPress
METHOD method_46431 build ()Lnet/minecraft/class_4185;
METHOD method_46432 setWidth (I)Lnet/minecraft/class_4185$class_7840;
ARG 1 width
METHOD method_46433 setPosition (II)Lnet/minecraft/class_4185$class_7840;
ARG 1 x
ARG 2 y
METHOD method_46434 setPositionAndSize (IIII)Lnet/minecraft/class_4185$class_7840;
ARG 1 x
ARG 2 y
ARG 3 width
ARG 4 height
METHOD method_46435 setNarrationSupplier (Lnet/minecraft/class_4185$class_7841;)Lnet/minecraft/class_4185$class_7840;
ARG 1 narrationSupplier
METHOD method_46436 setTooltipSupplier (Lnet/minecraft/class_4185$class_5316;)Lnet/minecraft/class_4185$class_7840;
ARG 1 tooltipSupplier
METHOD method_46437 setSize (II)Lnet/minecraft/class_4185$class_7840;
ARG 1 width
ARG 2 height
CLASS class_7841 NarrationSupplier
METHOD createNarrationMessage (Ljava/util/function/Supplier;)Lnet/minecraft/class_5250;
ARG 1 textSupplier

8
mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping
View File

@ -20,6 +20,8 @@ CLASS net/minecraft/class_339 net/minecraft/client/gui/widget/ClickableWidget
ARG 4 height
ARG 5 message
METHOD method_1893 setPos (II)V
ARG 1 x
ARG 2 y
METHOD method_25348 onClick (DD)V
ARG 1 mouseX
ARG 3 mouseY
@ -74,3 +76,9 @@ CLASS net/minecraft/class_339 net/minecraft/client/gui/widget/ClickableWidget
ARG 0 message
METHOD method_37021 appendDefaultNarrations (Lnet/minecraft/class_6382;)V
ARG 1 builder
METHOD method_46419 setY (I)V
ARG 1 y
METHOD method_46421 setX (I)V
ARG 1 x
METHOD method_46426 getX ()I
METHOD method_46427 getY ()I

13
mappings/net/minecraft/client/gui/widget/EmptyWidget.mapping Normal file
View File

@ -0,0 +1,13 @@
CLASS net/minecraft/class_7852 net/minecraft/client/gui/widget/EmptyWidget
METHOD <init> (II)V
ARG 1 width
ARG 2 height
METHOD <init> (IIII)V
ARG 1 x
ARG 2 y
ARG 3 width
ARG 4 height
METHOD method_46512 ofWidth (I)Lnet/minecraft/class_339;
ARG 0 width
METHOD method_46513 ofHeight (I)Lnet/minecraft/class_339;
ARG 0 height

53
mappings/net/minecraft/client/gui/widget/GridWidget.mapping Normal file
View File

@ -0,0 +1,53 @@
CLASS net/minecraft/class_7845 net/minecraft/client/gui/widget/GridWidget
COMMENT A widget that positions its children in a 2D grid.
COMMENT
COMMENT @see net.minecraft.util.math.GridBlockLengthIterator
FIELD field_40771 children Ljava/util/List;
FIELD field_40772 grids Ljava/util/List;
FIELD field_40773 mainPositioner Lnet/minecraft/class_7847;
METHOD <init> (II)V
ARG 1 x
ARG 2 y
METHOD <init> (IILnet/minecraft/class_2561;)V
ARG 1 x
ARG 2 y
ARG 3 message
METHOD method_46452 add (Lnet/minecraft/class_339;II)Lnet/minecraft/class_339;
ARG 1 widget
ARG 2 row
ARG 3 column
METHOD method_46453 add (Lnet/minecraft/class_339;IIII)Lnet/minecraft/class_339;
ARG 1 widget
ARG 2 row
ARG 3 column
ARG 4 occupiedRows
ARG 5 occupiedColumns
METHOD method_46454 add (Lnet/minecraft/class_339;IIIILnet/minecraft/class_7847;)Lnet/minecraft/class_339;
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_339;IILnet/minecraft/class_7847;)Lnet/minecraft/class_339;
ARG 1 widget
ARG 2 row
ARG 3 column
ARG 4 positioner
METHOD method_46456 recalculateDimensions ()V
METHOD method_46457 copyPositioner ()Lnet/minecraft/class_7847;
METHOD method_46458 getMainPositioner ()Lnet/minecraft/class_7847;
CLASS class_7846 Element
FIELD field_40774 row I
FIELD field_40775 column I
FIELD field_40776 occupiedRows I
FIELD field_40777 occupiedColumns I
METHOD <init> (Lnet/minecraft/class_339;IIIILnet/minecraft/class_7847;)V
ARG 1 widget
ARG 2 row
ARG 3 column
ARG 4 occupiedRows
ARG 5 occupiedColumns
ARG 6 positioner
METHOD method_46459 getRowEnd ()I
METHOD method_46460 getColumnEnd ()I

48
mappings/net/minecraft/client/gui/widget/Positioner.mapping Normal file
View File

@ -0,0 +1,48 @@
CLASS net/minecraft/class_7847 net/minecraft/client/gui/widget/Positioner
METHOD method_46461 alignLeft ()Lnet/minecraft/class_7847;
METHOD method_46462 relativeX (F)Lnet/minecraft/class_7847;
ARG 1 relativeX
METHOD method_46463 relative (FF)Lnet/minecraft/class_7847;
ARG 1 x
ARG 2 y
METHOD method_46464 margin (I)Lnet/minecraft/class_7847;
ARG 1 value
METHOD method_46465 margin (II)Lnet/minecraft/class_7847;
ARG 1 x
ARG 2 y
METHOD method_46466 margin (IIII)Lnet/minecraft/class_7847;
ARG 1 left
ARG 2 top
ARG 3 right
ARG 4 bottom
METHOD method_46467 alignHorizontalCenter ()Lnet/minecraft/class_7847;
METHOD method_46468 relativeY (F)Lnet/minecraft/class_7847;
ARG 1 relativeY
METHOD method_46469 marginLeft (I)Lnet/minecraft/class_7847;
ARG 1 marginLeft
METHOD method_46470 alignRight ()Lnet/minecraft/class_7847;
METHOD method_46471 marginTop (I)Lnet/minecraft/class_7847;
ARG 1 marginTop
METHOD method_46472 alignTop ()Lnet/minecraft/class_7847;
METHOD method_46473 marginRight (I)Lnet/minecraft/class_7847;
ARG 1 marginRight
METHOD method_46474 alignVerticalCenter ()Lnet/minecraft/class_7847;
METHOD method_46475 marginBottom (I)Lnet/minecraft/class_7847;
ARG 1 marginBottom
METHOD method_46476 alignBottom ()Lnet/minecraft/class_7847;
METHOD method_46477 marginX (I)Lnet/minecraft/class_7847;
ARG 1 marginX
METHOD method_46478 copy ()Lnet/minecraft/class_7847;
METHOD method_46479 marginY (I)Lnet/minecraft/class_7847;
ARG 1 marginY
METHOD method_46480 toImpl ()Lnet/minecraft/class_7847$class_7848;
METHOD method_46481 create ()Lnet/minecraft/class_7847;
CLASS class_7848 Impl
FIELD field_40778 marginLeft I
FIELD field_40779 marginTop I
FIELD field_40780 marginRight I
FIELD field_40781 marginBottom I
FIELD field_40782 relativeX F
FIELD field_40783 relativeY F
METHOD <init> (Lnet/minecraft/class_7847$class_7848;)V
ARG 1 original

55
mappings/net/minecraft/client/gui/widget/SimplePositioningWidget.mapping Normal file
View File

@ -0,0 +1,55 @@
CLASS net/minecraft/class_7843 net/minecraft/client/gui/widget/SimplePositioningWidget
COMMENT A widget that positions its children relative to the widget's position.
COMMENT This does not attempt to prevent widgets overlapping with each other;
COMMENT if this is necessary, consider {@link GridWidget}.
FIELD field_40766 elements Ljava/util/List;
FIELD field_40767 children Ljava/util/List;
FIELD field_40768 minHeight I
FIELD field_40769 minWidth I
FIELD field_40770 mainPositioner Lnet/minecraft/class_7847;
METHOD <init> (IIII)V
ARG 1 x
ARG 2 y
ARG 3 width
ARG 4 height
METHOD method_46439 of (II)Lnet/minecraft/class_7843;
ARG 0 minWidth
ARG 1 minHeight
METHOD method_46440 setPos (IIILjava/util/function/Consumer;F)V
ARG 0 low
ARG 1 high
ARG 2 length
ARG 3 setter
ARG 4 relative
METHOD method_46441 add (Lnet/minecraft/class_339;)Lnet/minecraft/class_339;
ARG 1 widget
METHOD method_46442 setPos (Lnet/minecraft/class_339;IIII)V
ARG 0 widget
ARG 1 left
ARG 2 top
ARG 3 right
ARG 4 bottom
METHOD method_46443 setPos (Lnet/minecraft/class_339;IIIIFF)V
ARG 0 widget
ARG 1 left
ARG 2 top
ARG 3 right
ARG 4 bottom
ARG 5 relativeX
ARG 6 relativeY
METHOD method_46444 add (Lnet/minecraft/class_339;Lnet/minecraft/class_7847;)Lnet/minecraft/class_339;
ARG 1 widget
ARG 2 positioner
METHOD method_46445 (Lnet/minecraft/class_7843$class_7844;)Lnet/minecraft/class_339;
ARG 0 element
METHOD method_46446 setDimensions (II)Lnet/minecraft/class_7843;
ARG 1 minWidth
ARG 2 minHeight
METHOD method_46447 setMinHeight (I)Lnet/minecraft/class_7843;
ARG 1 minWidth
METHOD method_46448 copyPositioner ()Lnet/minecraft/class_7847;
METHOD method_46449 setMinWidth (I)Lnet/minecraft/class_7843;
ARG 1 minHeight
METHOD method_46450 getMainPositioner ()Lnet/minecraft/class_7847;
METHOD method_46451 recalculateDimensions ()V
CLASS class_7844 Element

20
mappings/net/minecraft/client/gui/widget/TextWidget.mapping Normal file
View File

@ -0,0 +1,20 @@
CLASS net/minecraft/class_7842 net/minecraft/client/gui/widget/TextWidget
FIELD field_40764 textColor I
FIELD field_40765 textRenderer Lnet/minecraft/class_327;
METHOD <init> (IIIILnet/minecraft/class_2561;Lnet/minecraft/class_327;)V
ARG 1 x
ARG 2 y
ARG 3 width
ARG 4 height
ARG 5 message
ARG 6 textRenderer
METHOD <init> (IILnet/minecraft/class_2561;Lnet/minecraft/class_327;)V
ARG 1 width
ARG 2 height
ARG 3 message
ARG 4 textRenderer
METHOD <init> (Lnet/minecraft/class_2561;Lnet/minecraft/class_327;)V
ARG 1 message
ARG 2 textRenderer
METHOD method_46438 setTextColor (I)Lnet/minecraft/class_7842;
ARG 1 textColor

3
mappings/net/minecraft/client/gui/widget/TexturedButtonWidget.mapping
View File

@ -63,6 +63,3 @@ CLASS net/minecraft/class_344 net/minecraft/client/gui/widget/TexturedButtonWidg
ARG 6 v
ARG 7 texture
ARG 8 pressAction
METHOD method_1893 (II)V
ARG 1 x
ARG 2 y

21
mappings/net/minecraft/client/gui/widget/WrapperWidget.mapping Normal file
View File

@ -0,0 +1,21 @@
CLASS net/minecraft/class_7838 net/minecraft/client/gui/widget/WrapperWidget
FIELD field_40750 focusedElement Lnet/minecraft/class_364;
FIELD field_40751 dragging Z
METHOD method_46417 (DDLnet/minecraft/class_339;)V
ARG 4 widget
METHOD method_46418 wrappedWidgets ()Ljava/util/List;
METHOD method_46420 getHoveredElement ()Lnet/minecraft/class_364;
CLASS class_7839 WrappedElement
FIELD field_40752 widget Lnet/minecraft/class_339;
FIELD field_40753 positioner Lnet/minecraft/class_7847$class_7848;
METHOD <init> (Lnet/minecraft/class_339;Lnet/minecraft/class_7847;)V
ARG 1 widget
ARG 2 positioner
METHOD method_46422 getHeight ()I
METHOD method_46423 setX (II)V
ARG 1 left
ARG 2 right
METHOD method_46424 getWidth ()I
METHOD method_46425 setY (II)V
ARG 1 top
ARG 2 bottom