From a2e237b8a8c26ed2b0aa5bedeca360930b661723 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Tue, 26 Apr 2022 07:25:17 +0900 Subject: [PATCH] 22w16b stuff (#3109) * 22w16b stuff * Rename path to iconPath --- .../gui/screen/world/WorldListWidget.mapping | 2 +- .../fix/EntityPaintingFieldsRenameFix.mapping | 8 ++++++ .../net/minecraft/recipe/Ingredient.mapping | 2 ++ .../server/ServerConfigHandler.mapping | 8 ++++-- .../server/filter/TextFilterer.mapping | 2 ++ .../world/ThreadedAnvilChunkStorage.mapping | 21 +++++++++++++++ .../minecraft/test/GameTestException.mapping | 2 ++ .../test/TickLimitExceededException.mapping | 2 ++ .../util/InvalidIdentifierException.mapping | 2 ++ mappings/net/minecraft/util/Util.mapping | 26 +++++++++++++++++++ .../collection/PackedIntegerArray.mapping | 6 +++++ .../world/level/storage/LevelStorage.mapping | 26 +++++++++++++++++++ .../storage/LevelStorageException.mapping | 4 +++ .../world/level/storage/LevelSummary.mapping | 7 +++-- .../storage/EntityChunkDataAccess.mapping | 2 ++ .../SerializingRegionBasedStorage.mapping | 7 +++++ 16 files changed, 122 insertions(+), 5 deletions(-) diff --git a/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping b/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping index 7c98943026..12eddbdba7 100644 --- a/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping @@ -54,7 +54,7 @@ CLASS net/minecraft/class_528 net/minecraft/client/gui/screen/world/WorldListWid FIELD field_19137 screen Lnet/minecraft/class_526; FIELD field_19138 level Lnet/minecraft/class_34; FIELD field_19139 iconLocation Lnet/minecraft/class_2960; - FIELD field_19140 iconFile Ljava/nio/file/Path; + FIELD field_19140 iconPath Ljava/nio/file/Path; FIELD field_19141 icon Lnet/minecraft/class_1043; FIELD field_19142 time J METHOD (Lnet/minecraft/class_528;Lnet/minecraft/class_528;Lnet/minecraft/class_34;)V diff --git a/mappings/net/minecraft/datafixer/fix/EntityPaintingFieldsRenameFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityPaintingFieldsRenameFix.mapping index 8413ad31fe..64a09de9c2 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityPaintingFieldsRenameFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityPaintingFieldsRenameFix.mapping @@ -1,3 +1,11 @@ CLASS net/minecraft/class_7407 net/minecraft/datafixer/fix/EntityPaintingFieldsRenameFix METHOD (Lcom/mojang/datafixers/schemas/Schema;)V ARG 1 schema + METHOD method_43386 rename (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 1 dynamic + METHOD method_43387 rename (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic; + ARG 1 dynamic + ARG 2 oldKey + ARG 3 newKey + METHOD method_43388 (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/lang/String;Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 3 value diff --git a/mappings/net/minecraft/recipe/Ingredient.mapping b/mappings/net/minecraft/recipe/Ingredient.mapping index 2df293dc14..c526df2915 100644 --- a/mappings/net/minecraft/recipe/Ingredient.mapping +++ b/mappings/net/minecraft/recipe/Ingredient.mapping @@ -28,6 +28,8 @@ CLASS net/minecraft/class_1856 net/minecraft/recipe/Ingredient METHOD method_8102 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_1856; ARG 0 json METHOD method_8103 isEmpty ()Z + METHOD method_8104 (Lnet/minecraft/class_1856$class_1859;)Ljava/util/stream/Stream; + ARG 0 entry METHOD method_8105 getMatchingStacks ()[Lnet/minecraft/class_1799; METHOD method_8106 fromTag (Lnet/minecraft/class_6862;)Lnet/minecraft/class_1856; ARG 0 tag diff --git a/mappings/net/minecraft/server/ServerConfigHandler.mapping b/mappings/net/minecraft/server/ServerConfigHandler.mapping index 8bc6fa67d6..2ae2bb2af1 100644 --- a/mappings/net/minecraft/server/ServerConfigHandler.mapping +++ b/mappings/net/minecraft/server/ServerConfigHandler.mapping @@ -38,6 +38,8 @@ CLASS net/minecraft/class_3321 net/minecraft/server/ServerConfigHandler ARG 0 file METHOD method_14550 convertPlayerFiles (Lnet/minecraft/class_3176;)Z ARG 0 minecraftServer + METHOD method_14552 (Ljava/lang/String;)Z + ARG 0 playerName CLASS 1 METHOD onProfileLookupFailed (Lcom/mojang/authlib/GameProfile;Ljava/lang/Exception;)V ARG 1 profile @@ -75,6 +77,8 @@ CLASS net/minecraft/class_3321 net/minecraft/server/ServerConfigHandler METHOD onProfileLookupSucceeded (Lcom/mojang/authlib/GameProfile;)V ARG 1 profile CLASS class_3322 ServerConfigException + METHOD (Ljava/lang/String;)V + ARG 1 message METHOD (Ljava/lang/String;Ljava/lang/Throwable;)V - ARG 1 title - ARG 2 other + ARG 1 message + ARG 2 cause diff --git a/mappings/net/minecraft/server/filter/TextFilterer.mapping b/mappings/net/minecraft/server/filter/TextFilterer.mapping index f14e910b54..85b14502e2 100644 --- a/mappings/net/minecraft/server/filter/TextFilterer.mapping +++ b/mappings/net/minecraft/server/filter/TextFilterer.mapping @@ -95,6 +95,8 @@ CLASS net/minecraft/class_5514 net/minecraft/server/filter/TextFilterer METHOD method_33809 (Ljava/lang/Throwable;)Ljava/util/List; ARG 0 throwable CLASS class_5517 FailedHttpRequestException + METHOD (Ljava/lang/String;)V + ARG 1 message CLASS class_7241 ProfileEncoder METHOD encode (Lcom/mojang/authlib/GameProfile;)Lcom/google/gson/JsonObject; ARG 1 gameProfile diff --git a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping index bf9cc49819..d3d7d90828 100644 --- a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping +++ b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping @@ -275,6 +275,27 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor METHOD method_40069 (Ljava/lang/StringBuilder;Lnet/minecraft/class_3193;Lcom/mojang/datafixers/util/Pair;)V ARG 2 pair METHOD method_41247 getNoiseConfig ()Lnet/minecraft/class_7138; + METHOD method_43374 (Lnet/minecraft/class_1923;Ljava/lang/Throwable;)Lcom/mojang/datafixers/util/Either; + ARG 2 throwable + METHOD method_43375 (Lnet/minecraft/class_1923;Ljava/util/Optional;)Lcom/mojang/datafixers/util/Either; + ARG 2 nbt + METHOD method_43376 recoverFromException (Ljava/lang/Throwable;Lnet/minecraft/class_1923;)Lcom/mojang/datafixers/util/Either; + ARG 1 throwable + ARG 2 chunkPos + METHOD method_43377 (Ljava/util/Optional;)Ljava/util/Optional; + ARG 1 nbt + METHOD method_43378 (Lnet/minecraft/class_1923;Ljava/util/Optional;)Ljava/util/Optional; + ARG 1 nbt + METHOD method_43379 (Lnet/minecraft/class_1923;Lnet/minecraft/class_2487;)Z + ARG 1 nbt2 + METHOD method_43380 containsStatus (Lnet/minecraft/class_2487;)Z + ARG 0 nbt + METHOD method_43381 updateChunkNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; + ARG 1 nbt + METHOD method_43382 getProtoChunk (Lnet/minecraft/class_1923;)Lnet/minecraft/class_2791; + ARG 1 chunkPos + METHOD method_43383 getUpdatedChunkNbt (Lnet/minecraft/class_1923;)Ljava/util/concurrent/CompletableFuture; + ARG 1 chunkPos CLASS class_3208 EntityTracker COMMENT An entity tracker governs which players' clients can see an entity. Each COMMENT tracker corresponds to one entity in a server world and is mapped from the diff --git a/mappings/net/minecraft/test/GameTestException.mapping b/mappings/net/minecraft/test/GameTestException.mapping index 33de015f60..8b5ff6215a 100644 --- a/mappings/net/minecraft/test/GameTestException.mapping +++ b/mappings/net/minecraft/test/GameTestException.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_4512 net/minecraft/test/GameTestException + METHOD (Ljava/lang/String;)V + ARG 1 message diff --git a/mappings/net/minecraft/test/TickLimitExceededException.mapping b/mappings/net/minecraft/test/TickLimitExceededException.mapping index 183a174298..225451119d 100644 --- a/mappings/net/minecraft/test/TickLimitExceededException.mapping +++ b/mappings/net/minecraft/test/TickLimitExceededException.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_4522 net/minecraft/test/TickLimitExceededException + METHOD (Ljava/lang/String;)V + ARG 1 message diff --git a/mappings/net/minecraft/util/InvalidIdentifierException.mapping b/mappings/net/minecraft/util/InvalidIdentifierException.mapping index 0a66fcd060..055e0566ad 100644 --- a/mappings/net/minecraft/util/InvalidIdentifierException.mapping +++ b/mappings/net/minecraft/util/InvalidIdentifierException.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_151 net/minecraft/util/InvalidIdentifierException + METHOD (Ljava/lang/String;)V + ARG 1 message METHOD (Ljava/lang/String;Ljava/lang/Throwable;)V ARG 1 message ARG 2 throwable diff --git a/mappings/net/minecraft/util/Util.mapping b/mappings/net/minecraft/util/Util.mapping index 25a516ea71..9367a19d76 100644 --- a/mappings/net/minecraft/util/Util.mapping +++ b/mappings/net/minecraft/util/Util.mapping @@ -180,6 +180,31 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util METHOD method_43253 copyShuffled ([Ljava/lang/Object;Lnet/minecraft/class_5819;)Ljava/util/List; ARG 0 array ARG 1 random + METHOD method_43368 (Ljava/util/List;Ljava/lang/Void;)Ljava/util/List; + ARG 1 void_ + METHOD method_43369 (Ljava/util/List;Ljava/util/concurrent/CompletableFuture;Ljava/lang/Throwable;)V + ARG 2 throwable + METHOD method_43370 combine (Ljava/util/List;Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletableFuture; + ARG 0 futures + ARG 1 exceptionHandler + METHOD method_43371 (Ljava/util/List;[Ljava/util/concurrent/CompletableFuture;Ljava/util/function/Consumer;Ljava/util/concurrent/CompletableFuture;)V + ARG 3 future + METHOD method_43372 (Ljava/util/function/Consumer;Ljava/util/List;ILjava/lang/Object;Ljava/lang/Throwable;)V + ARG 3 value + ARG 4 throwable + METHOD method_43373 combineCancellable (Ljava/util/List;)Ljava/util/concurrent/CompletableFuture; + COMMENT Combines a list of {@code futures} into one future that holds a list + COMMENT of their results. + COMMENT + COMMENT

The returned future is fail-fast; if any of the input futures fails, + COMMENT this returned future will be immediately completed exceptionally than + COMMENT waiting for other input futures. Additionally, all other futures will + COMMENT be canceled. + COMMENT + COMMENT @return the combined future + COMMENT @see #combine(List) + COMMENT @see #combineSafe(List) + ARG 0 futures METHOD method_645 previous (Ljava/lang/Iterable;Ljava/lang/Object;)Ljava/lang/Object; ARG 0 iterable ARG 1 object @@ -200,6 +225,7 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util COMMENT waiting for other input futures. COMMENT COMMENT @return the combined future + COMMENT @see #combineCancellable(List) COMMENT @see #combineSafe(List) ARG 0 futures COMMENT the completable futures to combine diff --git a/mappings/net/minecraft/util/collection/PackedIntegerArray.mapping b/mappings/net/minecraft/util/collection/PackedIntegerArray.mapping index 942ded32ea..cc9dfed465 100644 --- a/mappings/net/minecraft/util/collection/PackedIntegerArray.mapping +++ b/mappings/net/minecraft/util/collection/PackedIntegerArray.mapping @@ -21,6 +21,10 @@ CLASS net/minecraft/class_3508 net/minecraft/util/collection/PackedIntegerArray METHOD (II)V ARG 1 elementBits ARG 2 size + METHOD (II[I)V + ARG 1 elementBits + ARG 2 size + ARG 3 data METHOD (II[J)V ARG 1 elementBits ARG 2 size @@ -28,3 +32,5 @@ CLASS net/minecraft/class_3508 net/minecraft/util/collection/PackedIntegerArray METHOD method_27284 getStorageIndex (I)I ARG 1 index CLASS class_6685 InvalidLengthException + METHOD (Ljava/lang/String;)V + ARG 1 message diff --git a/mappings/net/minecraft/world/level/storage/LevelStorage.mapping b/mappings/net/minecraft/world/level/storage/LevelStorage.mapping index ad4b5d01a3..23f39bdaae 100644 --- a/mappings/net/minecraft/world/level/storage/LevelStorage.mapping +++ b/mappings/net/minecraft/world/level/storage/LevelStorage.mapping @@ -23,6 +23,7 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage METHOD method_240 isLevelNameValid (Ljava/lang/String;)Z ARG 1 name METHOD method_26998 readLevelProperties (Lnet/minecraft/class_32$class_7411;Ljava/util/function/BiFunction;)Ljava/lang/Object; + ARG 1 levelSave ARG 2 levelDataParser METHOD method_26999 create (Ljava/nio/file/Path;)Lnet/minecraft/class_32; ARG 0 path @@ -33,20 +34,33 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage ARG 1 dataFixer ARG 2 version METHOD method_29014 createLevelDataParser (Lnet/minecraft/class_32$class_7411;Z)Ljava/util/function/BiFunction; + ARG 1 levelSave ARG 2 locked METHOD method_29015 (Lnet/minecraft/class_32$class_7411;ZLjava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;)Lnet/minecraft/class_34; + ARG 3 path ARG 4 dataFixer METHOD method_29580 parseDataPackSettings (Lcom/mojang/serialization/Dynamic;)Lnet/minecraft/class_5359; ARG 0 dynamic METHOD method_29582 (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5359;Lcom/mojang/serialization/Lifecycle;Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;)Lnet/minecraft/class_31; + ARG 3 path ARG 4 dataFixer METHOD method_29583 readDataPackSettings (Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;)Lnet/minecraft/class_5359; + ARG 0 path ARG 1 dataFixer METHOD method_35504 getFormatName ()Ljava/lang/String; METHOD method_40035 loadCompactLevelData (Ljava/nio/file/Path;)Lnet/minecraft/class_2520; COMMENT {@return the compact version of the NBT for the level data {@code file}} COMMENT COMMENT

The returned NBT will not have {@code Player} and {@code WorldGenSettings} keys. + ARG 0 path + METHOD method_43417 loadSummaries (Lnet/minecraft/class_32$class_7410;)Ljava/util/concurrent/CompletableFuture; + ARG 1 levels + METHOD method_43419 (Lnet/minecraft/class_32$class_7411;)Z + ARG 0 levelSave + METHOD method_43420 (Ljava/nio/file/Path;)Z + ARG 0 path + METHOD method_43495 (Ljava/util/List;)Ljava/util/List; + ARG 0 summaries CLASS class_5143 Session FIELD field_23767 lock Lnet/minecraft/class_5125; FIELD field_23768 directory Lnet/minecraft/class_32$class_7411; @@ -90,3 +104,15 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage METHOD visitFile (Ljava/lang/Object;Ljava/nio/file/attribute/BasicFileAttributes;)Ljava/nio/file/FileVisitResult; ARG 1 path ARG 2 attributes + CLASS class_7410 LevelList + METHOD method_43421 isEmpty ()Z + CLASS class_7411 LevelSave + METHOD method_43422 getRootPath ()Ljava/lang/String; + METHOD method_43423 getPath (Lnet/minecraft/class_5218;)Ljava/nio/file/Path; + ARG 1 savePath + METHOD method_43424 getCorruptedLevelDatPath (Ljava/time/LocalDateTime;)Ljava/nio/file/Path; + ARG 1 dateTime + METHOD method_43425 getLevelDatPath ()Ljava/nio/file/Path; + METHOD method_43426 getLevelDatOldPath ()Ljava/nio/file/Path; + METHOD method_43427 getIconPath ()Ljava/nio/file/Path; + METHOD method_43428 getSessionLockPath ()Ljava/nio/file/Path; diff --git a/mappings/net/minecraft/world/level/storage/LevelStorageException.mapping b/mappings/net/minecraft/world/level/storage/LevelStorageException.mapping index dfd391358b..7f6ee68d2d 100644 --- a/mappings/net/minecraft/world/level/storage/LevelStorageException.mapping +++ b/mappings/net/minecraft/world/level/storage/LevelStorageException.mapping @@ -1 +1,5 @@ CLASS net/minecraft/class_33 net/minecraft/world/level/storage/LevelStorageException + FIELD field_38981 message Lnet/minecraft/class_2561; + METHOD (Lnet/minecraft/class_2561;)V + ARG 1 message + METHOD method_43416 getMessage ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/world/level/storage/LevelSummary.mapping b/mappings/net/minecraft/world/level/storage/LevelSummary.mapping index d6adb6d818..b659ded9d0 100644 --- a/mappings/net/minecraft/world/level/storage/LevelSummary.mapping +++ b/mappings/net/minecraft/world/level/storage/LevelSummary.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_34 net/minecraft/world/level/storage/LevelSummary FIELD field_205 name Ljava/lang/String; FIELD field_209 requiresConversion Z FIELD field_23772 locked Z - FIELD field_23773 file Ljava/nio/file/Path; + FIELD field_23773 iconPath Ljava/nio/file/Path; FIELD field_24191 details Lnet/minecraft/class_2561; FIELD field_25022 levelInfo Lnet/minecraft/class_1940; FIELD field_25023 versionInfo Lnet/minecraft/class_5315; @@ -12,6 +12,9 @@ CLASS net/minecraft/class_34 net/minecraft/world/level/storage/LevelSummary ARG 3 name ARG 4 requiresConversion ARG 5 locked + ARG 6 iconPath + METHOD compareTo (Ljava/lang/Object;)I + ARG 1 other METHOD method_247 getGameMode ()Lnet/minecraft/class_1934; METHOD method_248 getName ()Ljava/lang/String; METHOD method_249 getLastPlayed ()J @@ -22,7 +25,7 @@ CLASS net/minecraft/class_34 net/minecraft/world/level/storage/LevelSummary METHOD method_258 getVersion ()Lnet/minecraft/class_5250; METHOD method_259 hasCheats ()Z METHOD method_260 isFutureLevel ()Z - METHOD method_27020 getFile ()Ljava/nio/file/Path; + METHOD method_27020 getIconPath ()Ljava/nio/file/Path; METHOD method_27021 isLocked ()Z METHOD method_27429 getDetails ()Lnet/minecraft/class_2561; METHOD method_27430 createDetails ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping b/mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping index 420e19502e..7bb36b3950 100644 --- a/mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping +++ b/mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping @@ -15,6 +15,8 @@ CLASS net/minecraft/class_5565 net/minecraft/world/storage/EntityChunkDataAccess ARG 5 executor METHOD method_31730 (Lnet/minecraft/class_1923;Ljava/lang/Throwable;)Ljava/lang/Void; ARG 1 ex + METHOD method_31731 (Lnet/minecraft/class_1923;Ljava/util/Optional;)Lnet/minecraft/class_5566; + ARG 2 nbt METHOD method_31732 getChunkDataVersion (Lnet/minecraft/class_2487;)I ARG 0 chunkNbt METHOD method_31733 putChunkPos (Lnet/minecraft/class_2487;Lnet/minecraft/class_1923;)V diff --git a/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping b/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping index 3114fbe15f..9681bfe200 100644 --- a/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping +++ b/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping @@ -35,6 +35,9 @@ CLASS net/minecraft/class_4180 net/minecraft/world/storage/SerializingRegionBase ARG 1 pos METHOD method_20366 (JZLjava/lang/Object;)V ARG 4 sections + METHOD method_20367 serialize (Lnet/minecraft/class_1923;Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/Dynamic; + ARG 1 chunkPos + ARG 2 ops METHOD method_20368 update (Lnet/minecraft/class_1923;Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)V ARG 1 pos ARG 2 ops @@ -49,7 +52,11 @@ CLASS net/minecraft/class_4180 net/minecraft/world/storage/SerializingRegionBase ARG 1 pos METHOD method_28511 (JLcom/mojang/serialization/Dynamic;)Ljava/util/Optional; ARG 3 dynamic + METHOD method_28512 (Ljava/util/Map;Lcom/mojang/serialization/DynamicOps;Ljava/lang/String;Ljava/lang/Object;)V + ARG 3 object METHOD method_33637 chunkSectionPosAsLong (Lnet/minecraft/class_1923;I)J ARG 0 chunkPos ARG 1 y METHOD method_40020 hasUnsavedElements ()Z + METHOD method_43412 (Lnet/minecraft/class_1923;Ljava/lang/Throwable;)Ljava/util/Optional; + ARG 1 throwable