From 8b0ccf32d2f2cd0249cd9d855c8256d27e09c2f7 Mon Sep 17 00:00:00 2001 From: Yanis48 Date: Mon, 1 Jun 2020 23:36:23 +0200 Subject: [PATCH] Datapack failure screen (#1406) * Datapack failure screen * Update mappings/net/minecraft/util/Util.mapping Co-authored-by: liach <7806504+liach@users.noreply.github.com> * shouldHideMessage -> shouldBlockMessages * add docs * oups Co-authored-by: liach <7806504+liach@users.noreply.github.com> --- .../net/minecraft/client/MinecraftClient.mapping | 14 ++++++++++++++ .../gui/screen/DatapackFailureScreen.mapping | 7 +++++++ .../net/minecraft/server/MinecraftServer.mapping | 1 + mappings/net/minecraft/util/Util.mapping | 1 + 4 files changed, 23 insertions(+) create mode 100644 mappings/net/minecraft/client/gui/screen/DatapackFailureScreen.mapping diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 47d35be31e..4c5bacecbd 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -106,6 +106,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_1479 getResourcePackDir ()Ljava/io/File; METHOD method_1480 getItemRenderer ()Lnet/minecraft/class_918; METHOD method_1481 joinWorld (Lnet/minecraft/class_638;)V + ARG 1 world METHOD method_1483 getSoundManager ()Lnet/minecraft/class_1144; METHOD method_1484 getSearchableContainer (Lnet/minecraft/class_1124$class_1125;)Lnet/minecraft/class_1123; ARG 1 key @@ -170,6 +171,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_1558 getCurrentServerEntry ()Lnet/minecraft/class_642; METHOD method_1559 startIntegratedServer (Ljava/lang/String;Lnet/minecraft/class_1940;)V ARG 1 name + ARG 2 levelInfo METHOD method_1560 getCameraEntity ()Lnet/minecraft/class_1297; METHOD method_1561 getEntityRenderManager ()Lnet/minecraft/class_898; METHOD method_1562 getNetworkHandler ()Lnet/minecraft/class_634; @@ -204,7 +206,9 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_18096 disconnect (Lnet/minecraft/class_437;)V ARG 1 screen METHOD method_18097 setWorld (Lnet/minecraft/class_638;)V + ARG 1 world METHOD method_18098 reset (Lnet/minecraft/class_437;)V + ARG 1 screen METHOD method_18099 disconnect ()V METHOD method_18321 getPaintingManager ()Lnet/minecraft/class_4044; METHOD method_18502 setOverlay (Lnet/minecraft/class_4071;)V @@ -243,5 +247,15 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient ARG 2 monitor METHOD method_27466 initFont (Z)V ARG 1 forcesUnicode + METHOD method_29042 shouldBlockMessages (Ljava/util/UUID;)Z + COMMENT Checks if the client should block messages from the {@code sender}. + COMMENT + COMMENT

If true, messages will not be displayed in chat and narrator will not process + COMMENT them. + ARG 1 sender METHOD method_29043 isMultiplayerEnabled ()Z METHOD method_29044 isOnlineChatEnabled ()Z + METHOD method_29337 startIntegratedServer (Ljava/lang/String;Lnet/minecraft/class_1940;Z)V + ARG 1 name + ARG 2 levelInfo + ARG 3 safeMode diff --git a/mappings/net/minecraft/client/gui/screen/DatapackFailureScreen.mapping b/mappings/net/minecraft/client/gui/screen/DatapackFailureScreen.mapping new file mode 100644 index 0000000000..c8f7c63e43 --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/DatapackFailureScreen.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_5346 net/minecraft/client/gui/screen/DatapackFailureScreen + FIELD field_25264 name Ljava/lang/String; + FIELD field_25265 wrappedText Ljava/util/List; + FIELD field_25266 levelInfo Lnet/minecraft/class_1940; + METHOD (Ljava/lang/String;Lnet/minecraft/class_1940;)V + ARG 1 name + ARG 2 levelInfo diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index c182e31685..597d34bd3f 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -89,6 +89,7 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_24490 endMonitor (Lnet/minecraft/class_4758;)V ARG 1 monitor METHOD method_27051 syncChunkWrites ()Z + METHOD method_27725 convertLevel (Lnet/minecraft/class_32$class_5143;)V METHOD method_27727 getStructureManager ()Lnet/minecraft/class_3485; METHOD method_27902 acceptsStatusQuery ()Z METHOD method_27903 adjustTrackingDistance (I)I diff --git a/mappings/net/minecraft/util/Util.mapping b/mappings/net/minecraft/util/Util.mapping index 6caa37410a..4da76a66fe 100644 --- a/mappings/net/minecraft/util/Util.mapping +++ b/mappings/net/minecraft/util/Util.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util FIELD field_1129 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_18034 NEXT_SERVER_WORKER_ID Ljava/util/concurrent/atomic/AtomicInteger; FIELD field_18035 SERVER_WORKER_EXECUTOR Ljava/util/concurrent/ExecutorService; + FIELD field_25140 NIL_UUID Ljava/util/UUID; METHOD method_17815 stream (Ljava/util/Optional;)Ljava/util/stream/Stream; METHOD method_17974 ifPresentOrElse (Ljava/util/Optional;Ljava/util/function/Consumer;Ljava/lang/Runnable;)Ljava/util/Optional; METHOD method_18349 getServerWorkerExecutor ()Ljava/util/concurrent/Executor;