From b866ab6da7e49d513aec4bd566e1d75b53d9455e Mon Sep 17 00:00:00 2001 From: Emily Rose Alexandra Date: Sun, 21 Mar 2021 08:13:45 -0500 Subject: [PATCH] Book mappings (#2171) --- .../gui/screen/ingame/BookEditScreen.mapping | 55 ++++++++++++++++++- .../client/util/SelectionManager.mapping | 20 ++++++- 2 files changed, 71 insertions(+), 4 deletions(-) diff --git a/mappings/net/minecraft/client/gui/screen/ingame/BookEditScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/BookEditScreen.mapping index fd5ea5b9ee..85dcf34d3b 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/BookEditScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/BookEditScreen.mapping @@ -34,8 +34,8 @@ CLASS net/minecraft/class_473 net/minecraft/client/gui/screen/ingame/BookEditScr METHOD method_2407 finalizeBook (Z)V ARG 1 signBook METHOD method_2413 updateButtons ()V - METHOD method_2414 moveCursorToBottom ()V - METHOD method_2421 moveCursorToTop ()V + METHOD method_2414 moveToLineEnd ()V + METHOD method_2421 moveToLineStart ()V METHOD method_2427 getCurrentPageContent ()Ljava/lang/String; METHOD method_2436 appendNewPage ()V METHOD method_2437 openPreviousPage ()V @@ -49,11 +49,43 @@ CLASS net/minecraft/class_473 net/minecraft/client/gui/screen/ingame/BookEditScr METHOD method_27576 getPageContent ()Lnet/minecraft/class_473$class_5233; METHOD method_27577 invalidatePageContent ()V METHOD method_27578 createPageContent ()Lnet/minecraft/class_473$class_5233; - METHOD method_27581 (Lnet/minecraft/class_4587;Lnet/minecraft/class_473$class_5234;Z)V + METHOD method_27580 moveVertically (I)V + ARG 1 lines + METHOD method_27581 drawCursor (Lnet/minecraft/class_4587;Lnet/minecraft/class_473$class_5234;Z)V ARG 1 matrices + ARG 2 position + ARG 3 atEnd + METHOD method_27582 screenPositionToAbsolutePosition (Lnet/minecraft/class_473$class_5234;)Lnet/minecraft/class_473$class_5234; + ARG 1 position + METHOD method_27583 getRectFromCorners (Lnet/minecraft/class_473$class_5234;Lnet/minecraft/class_473$class_5234;)Lnet/minecraft/class_768; + ARG 1 start + ARG 2 end METHOD method_27584 setClipboard (Ljava/lang/String;)V ARG 1 clipboard + METHOD method_27585 getLineSelectionRectangle (Ljava/lang/String;Lnet/minecraft/class_5225;IIII)Lnet/minecraft/class_768; + ARG 1 string + ARG 2 handler + ARG 3 selectionStart + ARG 4 selectionEnd + ARG 5 lineY + ARG 6 lineStart + METHOD method_27588 drawSelection ([Lnet/minecraft/class_768;)V + ARG 1 selectionRectangles + METHOD method_27589 selectCurrentWord (I)V + ARG 1 cursor + METHOD method_27590 absolutePositionToScreenPosition (Lnet/minecraft/class_473$class_5234;)Lnet/minecraft/class_473$class_5234; + ARG 1 position + METHOD method_27591 getLineFromOffset ([II)I + ARG 0 lineStarts + ARG 1 position + METHOD method_27592 keyPressedEditMode (III)Z + ARG 1 keyCode + ARG 2 scanCode + ARG 3 modifiers METHOD method_27595 getClipboard ()Ljava/lang/String; + METHOD method_27597 moveUpLine ()V + METHOD method_27598 moveDownLine ()V + METHOD method_27872 changePage ()V CLASS class_475 Line FIELD field_24278 style Lnet/minecraft/class_2583; FIELD field_24279 content Ljava/lang/String; @@ -69,10 +101,27 @@ CLASS net/minecraft/class_473 net/minecraft/client/gui/screen/ingame/BookEditScr FIELD field_24271 EMPTY Lnet/minecraft/class_473$class_5233; FIELD field_24272 pageContent Ljava/lang/String; FIELD field_24273 position Lnet/minecraft/class_473$class_5234; + FIELD field_24274 atEnd Z + FIELD field_24275 lineStarts [I FIELD field_24276 lines [Lnet/minecraft/class_473$class_475; + FIELD field_24277 selectionRectangles [Lnet/minecraft/class_768; METHOD (Ljava/lang/String;Lnet/minecraft/class_473$class_5234;Z[I[Lnet/minecraft/class_473$class_475;[Lnet/minecraft/class_768;)V ARG 1 pageContent + ARG 2 position + ARG 3 atEnd + ARG 4 lineStarts ARG 5 lines + ARG 6 selectionRectangles + METHOD method_27600 getLineStart (I)I + ARG 1 position + METHOD method_27601 getVerticalOffset (II)I + ARG 1 position + ARG 2 lines + METHOD method_27602 getCursorPosition (Lnet/minecraft/class_327;Lnet/minecraft/class_473$class_5234;)I + ARG 1 renderer + ARG 2 position + METHOD method_27604 getLineEnd (I)I + ARG 1 position CLASS class_5234 Position FIELD field_24281 x I FIELD field_24282 y I diff --git a/mappings/net/minecraft/client/util/SelectionManager.mapping b/mappings/net/minecraft/client/util/SelectionManager.mapping index d2d1084563..c2aebccb9c 100644 --- a/mappings/net/minecraft/client/util/SelectionManager.mapping +++ b/mappings/net/minecraft/client/util/SelectionManager.mapping @@ -13,16 +13,22 @@ CLASS net/minecraft/class_3728 net/minecraft/client/util/SelectionManager ARG 4 clipboardSetter ARG 5 stringFilter METHOD method_16197 insert (Ljava/lang/String;)V + ARG 1 string METHOD method_16198 deleteSelectedText (Ljava/lang/String;)Ljava/lang/String; + ARG 1 string METHOD method_16199 insert (C)Z ARG 1 c METHOD method_16200 getSelectedText (Ljava/lang/String;)Ljava/lang/String; + ARG 1 string METHOD method_16201 getSelectionStart ()I METHOD method_16202 handleSpecialKey (I)Z ARG 1 keyCode METHOD method_16203 getSelectionEnd ()I - METHOD method_16204 moveCaretToEnd ()V + METHOD method_16204 putCursorAtEnd ()V METHOD method_27547 cut ()V + METHOD method_27548 setSelection (II)V + ARG 1 start + ARG 2 end METHOD method_27549 moveCursor (IZ)V ARG 1 offset ARG 2 shiftDown @@ -34,13 +40,22 @@ CLASS net/minecraft/class_3728 net/minecraft/client/util/SelectionManager METHOD method_27552 insert (Ljava/lang/String;Ljava/lang/String;)V ARG 1 string ARG 2 insertion + METHOD method_27553 moveCursorToStart (Z)V + ARG 1 shiftDown METHOD method_27554 paste ()V METHOD method_27555 moveCursorPastWord (IZ)V ARG 1 offset ARG 2 shiftDown METHOD method_27556 getClipboard (Lnet/minecraft/class_310;)Ljava/lang/String; ARG 0 client + METHOD method_27557 (Lnet/minecraft/class_310;Ljava/lang/String;)V + ARG 1 clipboardString + METHOD method_27558 moveCursorToEnd (Z)V + ARG 1 shiftDown METHOD method_27559 copy ()V + METHOD method_27560 moveCursorTo (IZ)V + ARG 1 position + ARG 2 shiftDown METHOD method_27561 makeClipboardSetter (Lnet/minecraft/class_310;)Ljava/util/function/Consumer; ARG 0 client METHOD method_27562 updateSelectionRange (Z)V @@ -48,3 +63,6 @@ CLASS net/minecraft/class_3728 net/minecraft/client/util/SelectionManager METHOD method_27563 selectAll ()V METHOD method_27564 delete (I)V ARG 1 cursorOffset + METHOD method_27567 clampCursorPosition (I)I + ARG 1 pos + METHOD method_27568 isSelecting ()Z