From db44f9c249fb5bacf590bdb4933e02b7d67c42f5 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Sun, 4 Jul 2021 09:31:01 +0900 Subject: [PATCH] 1.17.1-rc1 stuff (#2540) --- .../net/minecraft/block/entity/SkullBlockEntity.mapping | 4 ++++ .../client/gui/screen/world/EditWorldScreen.mapping | 4 ++++ .../client/network/ClientPlayNetworkHandler.mapping | 2 ++ .../net/minecraft/client/render/GameRenderer.mapping | 5 +++++ .../net/minecraft/client/util/ScreenshotRecorder.mapping | 7 +++++++ .../network/listener/ClientPlayPacketListener.mapping | 2 +- .../packet/s2c/play/EntitiesDestroyS2CPacket.mapping | 9 +++++++++ .../packet/s2c/play/EntityDestroyS2CPacket.mapping | 5 ----- mappings/net/minecraft/server/MinecraftServer.mapping | 2 ++ mappings/net/minecraft/util/UserCache.mapping | 3 +++ 10 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 mappings/net/minecraft/network/packet/s2c/play/EntitiesDestroyS2CPacket.mapping delete mode 100644 mappings/net/minecraft/network/packet/s2c/play/EntityDestroyS2CPacket.mapping diff --git a/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping b/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping index dae9f8bf75..28cc5d5b24 100644 --- a/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping @@ -33,3 +33,7 @@ CLASS net/minecraft/class_2631 net/minecraft/block/entity/SkullBlockEntity ARG 1 owner METHOD method_37428 setExecutor (Ljava/util/concurrent/Executor;)V ARG 0 executor + METHOD method_37468 (Ljava/util/function/Consumer;Lcom/mojang/authlib/GameProfile;Ljava/util/Optional;)V + ARG 2 profile + METHOD method_37469 (Ljava/util/function/Consumer;Lcom/mojang/authlib/GameProfile;)V + ARG 1 profile diff --git a/mappings/net/minecraft/client/gui/screen/world/EditWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/EditWorldScreen.mapping index 47ae52b1de..eb1de0902b 100644 --- a/mappings/net/minecraft/client/gui/screen/world/EditWorldScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/EditWorldScreen.mapping @@ -37,3 +37,7 @@ CLASS net/minecraft/class_524 net/minecraft/client/gui/screen/world/EditWorldScr METHOD method_29784 onBackupConfirm (Lnet/minecraft/class_32;Ljava/lang/String;)V ARG 0 storage ARG 1 levelName + METHOD method_37470 (Ljava/nio/file/Path;)Z + ARG 0 path + METHOD method_37471 (Ljava/nio/file/Path;)V + ARG 0 path diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping index 4fa8791a83..91128a09ba 100644 --- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping @@ -69,3 +69,5 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand METHOD method_36322 getServerResourcePackPrompt (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; ARG 0 defaultPrompt ARG 1 customPrompt + METHOD method_37472 (I)V + ARG 1 entityId diff --git a/mappings/net/minecraft/client/render/GameRenderer.mapping b/mappings/net/minecraft/client/render/GameRenderer.mapping index a3196a1981..388ebc5e9b 100644 --- a/mappings/net/minecraft/client/render/GameRenderer.mapping +++ b/mappings/net/minecraft/client/render/GameRenderer.mapping @@ -59,6 +59,7 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer FIELD field_29403 blitScreenShader Lnet/minecraft/class_5944; FIELD field_33626 renderTypeTextIntensityShader Lnet/minecraft/class_5944; FIELD field_33627 renderTypeTextIntensitySeeThroughShader Lnet/minecraft/class_5944; + FIELD field_34055 hasWorldIcon Z FIELD field_3988 zoomX F FIELD field_3992 renderHand Z FIELD field_3993 LOGGER Lorg/apache/logging/log4j/Logger; @@ -116,6 +117,7 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer METHOD method_3174 getNightVisionStrength (Lnet/minecraft/class_1309;F)F ARG 0 entity METHOD method_3176 updateWorldIcon (Ljava/nio/file/Path;)V + ARG 1 path METHOD method_3182 tick ()V METHOD method_3183 getShader ()Lnet/minecraft/class_279; METHOD method_3184 toggleShadersEnabled ()V @@ -333,3 +335,6 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer ARG 0 shader METHOD method_36541 (Lnet/minecraft/class_5944;)V ARG 0 shader + METHOD method_37473 updateWorldIcon ()V + METHOD method_37474 (Ljava/nio/file/Path;)V + ARG 1 path diff --git a/mappings/net/minecraft/client/util/ScreenshotRecorder.mapping b/mappings/net/minecraft/client/util/ScreenshotRecorder.mapping index 201e13827f..b5f8228b06 100644 --- a/mappings/net/minecraft/client/util/ScreenshotRecorder.mapping +++ b/mappings/net/minecraft/client/util/ScreenshotRecorder.mapping @@ -19,15 +19,22 @@ CLASS net/minecraft/class_318 net/minecraft/client/util/ScreenshotRecorder ARG 4 unitHeight METHOD method_1659 saveScreenshot (Ljava/io/File;Lnet/minecraft/class_276;Ljava/util/function/Consumer;)V ARG 0 gameDirectory + ARG 1 framebuffer + ARG 2 messageReceiver METHOD method_1660 getScreenshotFilename (Ljava/io/File;)Ljava/io/File; ARG 0 directory METHOD method_1662 saveScreenshotInner (Ljava/io/File;Ljava/lang/String;Lnet/minecraft/class_276;Ljava/util/function/Consumer;)V ARG 0 gameDirectory ARG 1 fileName + ARG 2 framebuffer + ARG 3 messageReceiver METHOD method_1663 takeScreenshot (Lnet/minecraft/class_276;)Lnet/minecraft/class_1011; + ARG 0 framebuffer METHOD method_22690 saveScreenshot (Ljava/io/File;Ljava/lang/String;Lnet/minecraft/class_276;Ljava/util/function/Consumer;)V ARG 0 gameDirectory ARG 1 fileName + ARG 2 framebuffer + ARG 3 messageReceiver METHOD method_35710 writeToStream ()V COMMENT Writes the contents in the {@link #buffer} into the {@link #stream}. METHOD method_35711 getIntoBuffer (Ljava/nio/ByteBuffer;IIII)V diff --git a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping index d70c57a0ce..79d9613147 100644 --- a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping @@ -36,7 +36,7 @@ CLASS net/minecraft/class_2602 net/minecraft/network/listener/ClientPlayPacketLi ARG 1 packet METHOD method_11094 onBlockEntityUpdate (Lnet/minecraft/class_2622;)V ARG 1 packet - METHOD method_11095 onEntityDestroy (Lnet/minecraft/class_2716;)V + METHOD method_11095 onEntitiesDestroy (Lnet/minecraft/class_2716;)V ARG 1 packet METHOD method_11097 onPlayerSpawn (Lnet/minecraft/class_2613;)V ARG 1 packet diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntitiesDestroyS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntitiesDestroyS2CPacket.mapping new file mode 100644 index 0000000000..762ec7bc39 --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/play/EntitiesDestroyS2CPacket.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_2716 net/minecraft/network/packet/s2c/play/EntitiesDestroyS2CPacket + FIELD field_33690 entityIds Lit/unimi/dsi/fastutil/ints/IntList; + METHOD (Lit/unimi/dsi/fastutil/ints/IntList;)V + ARG 1 entityIds + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD ([I)V + ARG 1 entityIds + METHOD method_36548 getEntityIds ()Lit/unimi/dsi/fastutil/ints/IntList; diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntityDestroyS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntityDestroyS2CPacket.mapping deleted file mode 100644 index 6a3c9a5cbb..0000000000 --- a/mappings/net/minecraft/network/packet/s2c/play/EntityDestroyS2CPacket.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/class_2716 net/minecraft/network/packet/s2c/play/EntityDestroyS2CPacket - FIELD field_33690 entityId Lit/unimi/dsi/fastutil/ints/IntList; - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD method_36548 getEntityId ()Lit/unimi/dsi/fastutil/ints/IntList; diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index 2f737dd86c..80e94bbbd4 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -239,6 +239,8 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_3745 setFlightEnabled (Z)V ARG 1 flightEnabled METHOD method_3747 stop (Z)V + METHOD method_37475 (Lnet/minecraft/class_2926;Ljava/io/File;)V + ARG 1 file METHOD method_3748 tick (Ljava/util/function/BooleanSupplier;)V ARG 1 shouldKeepTicking METHOD method_3749 getMaxWorldBorderRadius ()I diff --git a/mappings/net/minecraft/util/UserCache.mapping b/mappings/net/minecraft/util/UserCache.mapping index 1eccfed907..194d8a42cf 100644 --- a/mappings/net/minecraft/util/UserCache.mapping +++ b/mappings/net/minecraft/util/UserCache.mapping @@ -44,6 +44,7 @@ CLASS net/minecraft/class_3312 net/minecraft/util/UserCache METHOD method_30169 incrementAndGetAccessCount ()J METHOD method_30170 getDateFormat ()Ljava/text/DateFormat; METHOD method_37155 (Ljava/lang/String;Ljava/util/Optional;Ljava/lang/Throwable;)V + ARG 2 profile ARG 3 throwable METHOD method_37156 findByNameAsync (Ljava/lang/String;Ljava/util/function/Consumer;)V ARG 1 username @@ -51,8 +52,10 @@ CLASS net/minecraft/class_3312 net/minecraft/util/UserCache METHOD method_37157 setExecutor (Ljava/util/concurrent/Executor;)V ARG 1 executor METHOD method_37158 (Ljava/util/function/Consumer;Ljava/util/Optional;Ljava/lang/Throwable;)V + ARG 1 profile ARG 2 throwable METHOD method_37160 (Ljava/util/function/Consumer;Ljava/util/Optional;Ljava/lang/Throwable;)V + ARG 1 profile ARG 2 throwable CLASS 1 METHOD onProfileLookupFailed (Lcom/mojang/authlib/GameProfile;Ljava/lang/Exception;)V