From 9936568cb43e6b132a09f80489befccb3bcb4fa5 Mon Sep 17 00:00:00 2001 From: LambdAurora Date: Wed, 8 Jul 2020 22:04:10 +0200 Subject: [PATCH] Map system toast and file dragging handler in Screen, rename misnamed Screen (#1546) * Map system toast and file dragging handler in Screen, rename misnamed screen. * Update mappings/net/minecraft/client/toast/SystemToast.mapping Co-authored-by: liach <7806504+liach@users.noreply.github.com> Co-authored-by: liach <7806504+liach@users.noreply.github.com> --- ...ionScreen.mapping => DialogScreen.mapping} | 4 ++- .../client/gui/screen/Screen.mapping | 3 ++ .../client/toast/SystemToast.mapping | 28 +++++++++++++++++++ .../net/minecraft/client/toast/Toast.mapping | 2 ++ 4 files changed, 36 insertions(+), 1 deletion(-) rename mappings/net/minecraft/client/gui/screen/{GraphicsConfirmationScreen.mapping => DialogScreen.mapping} (81%) diff --git a/mappings/net/minecraft/client/gui/screen/GraphicsConfirmationScreen.mapping b/mappings/net/minecraft/client/gui/screen/DialogScreen.mapping similarity index 81% rename from mappings/net/minecraft/client/gui/screen/GraphicsConfirmationScreen.mapping rename to mappings/net/minecraft/client/gui/screen/DialogScreen.mapping index 6d14e8c517..756e6e1d8f 100644 --- a/mappings/net/minecraft/client/gui/screen/GraphicsConfirmationScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/DialogScreen.mapping @@ -1,7 +1,9 @@ -CLASS net/minecraft/class_5405 net/minecraft/client/gui/screen/GraphicsConfirmationScreen +CLASS net/minecraft/class_5405 net/minecraft/client/gui/screen/DialogScreen FIELD field_25675 message Lnet/minecraft/class_5348; FIELD field_25676 choiceButtons Lcom/google/common/collect/ImmutableList; FIELD field_25677 lines Ljava/util/List; + FIELD field_25678 linesY I + FIELD field_25679 buttonWidth I METHOD (Lnet/minecraft/class_2561;Ljava/util/List;Lcom/google/common/collect/ImmutableList;)V ARG 1 title ARG 2 messageParts diff --git a/mappings/net/minecraft/client/gui/screen/Screen.mapping b/mappings/net/minecraft/client/gui/screen/Screen.mapping index bac655a31d..81cd8adfe1 100644 --- a/mappings/net/minecraft/client/gui/screen/Screen.mapping +++ b/mappings/net/minecraft/client/gui/screen/Screen.mapping @@ -61,6 +61,7 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen ARG 3 height METHOD method_25424 renderTooltip (Lnet/minecraft/class_4587;Lnet/minecraft/class_5348;II)V ARG 1 matrices + ARG 2 text ARG 3 x ARG 4 y METHOD method_25425 sendMessage (Ljava/lang/String;Z)V @@ -100,3 +101,5 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen METHOD method_25441 hasControlDown ()Z METHOD method_25442 hasShiftDown ()Z METHOD method_25443 hasAltDown ()Z + METHOD method_29638 filesDragged (Ljava/util/List;)V + ARG 1 paths diff --git a/mappings/net/minecraft/client/toast/SystemToast.mapping b/mappings/net/minecraft/client/toast/SystemToast.mapping index 5c3f3b9184..21408c7c20 100644 --- a/mappings/net/minecraft/client/toast/SystemToast.mapping +++ b/mappings/net/minecraft/client/toast/SystemToast.mapping @@ -3,6 +3,17 @@ CLASS net/minecraft/class_370 net/minecraft/client/toast/SystemToast FIELD field_2214 justUpdated Z FIELD field_2215 title Lnet/minecraft/class_5348; FIELD field_2216 startTime J + FIELD field_25037 lines Ljava/util/List; + FIELD field_25038 width I + METHOD (Lnet/minecraft/class_370$class_371;Lnet/minecraft/class_2561;Ljava/util/List;I)V + ARG 1 type + ARG 2 title + ARG 3 lines + ARG 4 width + METHOD (Lnet/minecraft/class_370$class_371;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V + ARG 1 type + ARG 2 title + ARG 3 description METHOD method_1990 show (Lnet/minecraft/class_374;Lnet/minecraft/class_370$class_371;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V ARG 0 manager ARG 1 type @@ -22,4 +33,21 @@ CLASS net/minecraft/class_370 net/minecraft/client/toast/SystemToast METHOD method_27025 addWorldDeleteFailureToast (Lnet/minecraft/class_310;Ljava/lang/String;)V ARG 0 client ARG 1 worldName + METHOD method_29046 drawPart (Lnet/minecraft/class_4587;Lnet/minecraft/class_374;IIII)V + ARG 1 matrices + ARG 2 manager + ARG 3 width + ARG 4 textureV + ARG 5 y + ARG 6 height + METHOD method_29047 create (Lnet/minecraft/class_310;Lnet/minecraft/class_370$class_371;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)Lnet/minecraft/class_370; + ARG 0 client + ARG 1 type + ARG 2 title + ARG 3 description + METHOD method_29626 getTextAsList (Lnet/minecraft/class_2561;)Lcom/google/common/collect/ImmutableList; + ARG 0 text + METHOD method_29627 addPackCopyFailure (Lnet/minecraft/class_310;Ljava/lang/String;)V + ARG 0 client + ARG 1 directory CLASS class_371 Type diff --git a/mappings/net/minecraft/client/toast/Toast.mapping b/mappings/net/minecraft/client/toast/Toast.mapping index 7d9cfe0e09..c1bd710696 100644 --- a/mappings/net/minecraft/client/toast/Toast.mapping +++ b/mappings/net/minecraft/client/toast/Toast.mapping @@ -6,6 +6,8 @@ CLASS net/minecraft/class_368 net/minecraft/client/toast/Toast ARG 2 manager ARG 3 startTime METHOD method_1987 getType ()Ljava/lang/Object; + METHOD method_29049 getWidth ()I + METHOD method_29050 getHeight ()I CLASS class_369 Visibility FIELD field_2211 sound Lnet/minecraft/class_3414; METHOD (Ljava/lang/String;ILnet/minecraft/class_3414;)V