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

Some refactor and clean up with KeyBinding and EntryListWidget$Entry (#1348) 

* Some clean up with KeyBinding and EntryListWidget$Entry

Signed-off-by: shedaniel <daniel@shedaniel.me>

* Apply suggestions from code review

Co-authored-by: liach <7806504+liach@users.noreply.github.com>

* Rename to InputUtil$Key

Signed-off-by: shedaniel <daniel@shedaniel.me>

* 20w20a

Signed-off-by: shedaniel <daniel@shedaniel.me>

* Update mappings/net/minecraft/client/util/InputUtil.mapping

Co-authored-by: liach <7806504+liach@users.noreply.github.com>

* Update mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping

Co-authored-by: Yanis48 <doublecraft.official@gmail.com>

Co-authored-by: liach <7806504+liach@users.noreply.github.com>
Co-authored-by: Yanis48 <doublecraft.official@gmail.com>
This commit is contained in:
shedaniel 2020-05-15 23:36:40 +08:00 committed by GitHub
parent c67050a4f4
commit b24611fe8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 66 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mappings/net/minecraft/client/gui/screen/options/ControlsListWidget.mapping
View File

@ -1,15 +1,20 @@
CLASS net/minecraft/class_459 net/minecraft/client/gui/screen/options/ControlsListWidget
FIELD field_2733 maxKeyNameLength I
FIELD field_2735 gui Lnet/minecraft/class_458;
FIELD field_2735 parent Lnet/minecraft/class_458;
METHOD <init> (Lnet/minecraft/class_458;Lnet/minecraft/class_310;)V
ARG 1 gui
ARG 1 parent
ARG 2 client
CLASS class_460 CategoryEntry
FIELD field_2736 name Lnet/minecraft/class_2561;
FIELD field_2737 nameWidth I
FIELD field_2736 text Lnet/minecraft/class_2561;
FIELD field_2737 textWidth I
METHOD <init> (Lnet/minecraft/class_459;Lnet/minecraft/class_2561;)V
ARG 2 text
CLASS class_461 Entry
CLASS class_462 KeyBindingEntry
FIELD field_2739 editButton Lnet/minecraft/class_4185;
FIELD field_2740 binding Lnet/minecraft/class_304;
FIELD field_2741 bindingName Lnet/minecraft/class_2561;
FIELD field_2743 resetButton Lnet/minecraft/class_4185;
METHOD <init> (Lnet/minecraft/class_459;Lnet/minecraft/class_304;Lnet/minecraft/class_2561;)V
ARG 2 binding
ARG 3 text

12
mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping
View File

@ -95,12 +95,14 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget
FIELD field_22752 list Lnet/minecraft/class_350;
METHOD method_25343 render (Lnet/minecraft/class_4587;IIIIIIIZF)V
ARG 1 matrices
ARG 2 x
ARG 2 index
ARG 3 y
ARG 4 width
ARG 5 height
ARG 6 mouseX
ARG 7 mouseY
ARG 4 x
ARG 5 entryWidth
ARG 6 entryHeight
ARG 7 mouseX
ARG 8 mouseY
ARG 9 hovered
ARG 10 tickDelta
CLASS class_352 Entries
FIELD field_2146 entries Ljava/util/List;

32
mappings/net/minecraft/client/options/KeyBinding.mapping
View File

@ -1,24 +1,26 @@
CLASS net/minecraft/class_304 net/minecraft/client/options/KeyBinding
FIELD field_1652 keyCategories Ljava/util/Set;
FIELD field_1653 pressed Z
FIELD field_1654 defaultKeyCode Lnet/minecraft/class_3675$class_306;
FIELD field_1655 keyCode Lnet/minecraft/class_3675$class_306;
FIELD field_1654 defaultKey Lnet/minecraft/class_3675$class_306;
FIELD field_1655 boundKey Lnet/minecraft/class_3675$class_306;
FIELD field_1656 categoryOrderMap Ljava/util/Map;
FIELD field_1657 keysById Ljava/util/Map;
FIELD field_1658 keysByCode Ljava/util/Map;
FIELD field_1658 keyToBindings Ljava/util/Map;
FIELD field_1659 category Ljava/lang/String;
FIELD field_1660 id Ljava/lang/String;
FIELD field_1660 translationKey Ljava/lang/String;
FIELD field_1661 timesPressed I
METHOD <init> (Ljava/lang/String;ILjava/lang/String;)V
ARG 1 id
ARG 2 keyCode
ARG 1 translationKey
ARG 2 code
ARG 3 category
METHOD <init> (Ljava/lang/String;Lnet/minecraft/class_3675$class_307;ILjava/lang/String;)V
ARG 1 id
ARG 1 translationKey
ARG 2 type
ARG 3 code
ARG 4 category
METHOD method_1415 isNotBound ()Z
METHOD compareTo (Ljava/lang/Object;)I
ARG 1 other
METHOD method_1415 isUnbound ()Z
METHOD method_1416 setKeyPressed (Lnet/minecraft/class_3675$class_306;Z)V
ARG 0 key
ARG 1 pressed
@ -28,22 +30,24 @@ CLASS net/minecraft/class_304 net/minecraft/client/options/KeyBinding
METHOD method_1419 getLocalizedName (Ljava/lang/String;)Ljava/util/function/Supplier;
ARG 0 id
METHOD method_1420 onKeyPressed (Lnet/minecraft/class_3675$class_306;)V
ARG 0 keyCode
METHOD method_1422 setKeyCode (Lnet/minecraft/class_3675$class_306;)V
ARG 0 key
METHOD method_1422 setBoundKey (Lnet/minecraft/class_3675$class_306;)V
ARG 1 boundKey
METHOD method_1423 getCategory ()Ljava/lang/String;
METHOD method_1424 updatePressedStates ()V
METHOD method_1425 reset ()V
METHOD method_1426 updateKeysByCode ()V
METHOD method_1427 isDefault ()Z
METHOD method_1428 getName ()Ljava/lang/String;
METHOD method_1429 getDefaultKeyCode ()Lnet/minecraft/class_3675$class_306;
METHOD method_1431 getId ()Ljava/lang/String;
METHOD method_1428 getBoundKeyTranslationKey ()Ljava/lang/String;
METHOD method_1429 getDefaultKey ()Lnet/minecraft/class_3675$class_306;
METHOD method_1431 getTranslationKey ()Ljava/lang/String;
METHOD method_1433 matchesMouse (I)Z
ARG 1 code
METHOD method_1434 isPressed ()Z
METHOD method_1435 equals (Lnet/minecraft/class_304;)Z
ARG 1 other
METHOD method_1436 wasPressed ()Z
METHOD method_1437 unpressAll ()V
METHOD method_16007 getLocalizedName ()Lnet/minecraft/class_2561;
METHOD method_16007 getBoundKeyLocalizedText ()Lnet/minecraft/class_2561;
METHOD method_23481 setPressed (Z)V
ARG 1 pressed

45
mappings/net/minecraft/client/util/InputUtil.mapping
View File

@ -1,39 +1,58 @@
CLASS net/minecraft/class_3675 net/minecraft/client/util/InputUtil
FIELD field_16237 UNKNOWN_KEYCODE Lnet/minecraft/class_3675$class_306;
FIELD field_16237 UNKNOWN_KEY Lnet/minecraft/class_3675$class_306;
FIELD field_20333 GLFW_RAW_MOUSE_MOTION_SUPPORTED_HANDLE Ljava/lang/invoke/MethodHandle;
FIELD field_20334 GLFW_RAW_MOUSE_MOTION I
METHOD method_15981 fromName (Ljava/lang/String;)Lnet/minecraft/class_3675$class_306;
ARG 0 s
METHOD method_15981 fromTranslationKey (Ljava/lang/String;)Lnet/minecraft/class_3675$class_306;
ARG 0 translationKey
METHOD method_15983 setMouseCallbacks (JLorg/lwjgl/glfw/GLFWCursorPosCallbackI;Lorg/lwjgl/glfw/GLFWMouseButtonCallbackI;Lorg/lwjgl/glfw/GLFWScrollCallbackI;)V
ARG 0 handle
ARG 2 cursorPosCallback
ARG 3 mouseButtonCallback
ARG 4 scrollCallback
METHOD method_15984 setCursorParameters (JIDD)V
METHOD method_15985 getKeyCode (II)Lnet/minecraft/class_3675$class_306;
ARG 0 handler
METHOD method_15985 fromKeyCode (II)Lnet/minecraft/class_3675$class_306;
ARG 0 keyCode
ARG 1 scanCode
METHOD method_15986 setKeyboardCallbacks (JLorg/lwjgl/glfw/GLFWKeyCallbackI;Lorg/lwjgl/glfw/GLFWCharModsCallbackI;)V
ARG 0 handle
ARG 2 keyCallback
ARG 3 charModsCallback
METHOD method_15987 isKeyPressed (JI)Z
ARG 0 handle
ARG 2 code
METHOD method_21735 isRawMouseMotionSupported ()Z
METHOD method_21736 setRawMouseMotionMode (JZ)V
ARG 0 window
ARG 2 value
CLASS class_306 KeyCode
FIELD field_1663 name Ljava/lang/String;
FIELD field_1664 NAMES Ljava/util/Map;
FIELD field_1665 keyCode I
CLASS class_306 Key
FIELD field_1663 translationKey Ljava/lang/String;
FIELD field_1664 KEYS Ljava/util/Map;
FIELD field_1665 code I
FIELD field_1666 type Lnet/minecraft/class_3675$class_307;
FIELD field_24196 localizedText Lnet/minecraft/class_3528;
METHOD <init> (Ljava/lang/String;Lnet/minecraft/class_3675$class_307;I)V
ARG 1 keyName
ARG 1 translationKey
ARG 2 type
ARG 3 code
METHOD equals (Ljava/lang/Object;)Z
ARG 1 o
METHOD method_1441 getName ()Ljava/lang/String;
ARG 1 other
METHOD method_1441 getTranslationKey ()Ljava/lang/String;
METHOD method_1442 getCategory ()Lnet/minecraft/class_3675$class_307;
METHOD method_1444 getKeyCode ()I
METHOD method_1444 getCode ()I
METHOD method_27445 getLocalizedText ()Lnet/minecraft/class_2561;
CLASS class_307 Type
FIELD field_1673 name Ljava/lang/String;
FIELD field_1674 map Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
FIELD field_24197 textTranslator Ljava/util/function/BiFunction;
METHOD <init> (Ljava/lang/String;ILjava/lang/String;Ljava/util/function/BiFunction;)V
ARG 3 name
ARG 4 textTranslator
METHOD method_1446 mapKey (Lnet/minecraft/class_3675$class_307;Ljava/lang/String;I)V
ARG 0 type
ARG 1 name
ARG 1 translationKey
ARG 2 keyCode
METHOD method_1447 createFromCode (I)Lnet/minecraft/class_3675$class_306;
ARG 1 code
METHOD method_27448 (I)Lnet/minecraft/class_3675$class_306;
ARG 1 code