From a70b1d3cea6a505c8bcfea291b75179e16c3ffdc Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Wed, 9 Feb 2022 20:25:03 +0900 Subject: [PATCH] 22w05a stuff (#2993) * 22w05a stuff * Update mappings/net/minecraft/util/math/Vec3i.mapping Co-authored-by: liach <7806504+liach@users.noreply.github.com> * Rename WeaponSmithChestLootTableFix Co-authored-by: liach <7806504+liach@users.noreply.github.com> --- .../gui/screen/CustomizeBuffetLevelScreen.mapping | 4 ++++ .../fix/WeaponsmithChestLootTableFix.mapping | 6 ++++++ mappings/net/minecraft/entity/Entity.mapping | 1 + .../entity/ai/goal/EscapeDangerGoal.mapping | 5 ++++- .../minecraft/entity/passive/PandaEntity.mapping | 2 +- .../minecraft/entity/passive/WolfEntity.mapping | 3 +++ .../minecraft/server/world/ChunkHolder.mapping | 1 + .../world/ThreadedAnvilChunkStorage.mapping | 7 +++++++ mappings/net/minecraft/util/math/Vec3i.mapping | 15 ++++++++++----- .../world/gen/feature/ConfiguredFeature.mapping | 1 + .../gen/feature/util/DripstoneHelper.mapping | 2 ++ 11 files changed, 40 insertions(+), 7 deletions(-) create mode 100644 mappings/net/minecraft/datafixer/fix/WeaponsmithChestLootTableFix.mapping diff --git a/mappings/net/minecraft/client/gui/screen/CustomizeBuffetLevelScreen.mapping b/mappings/net/minecraft/client/gui/screen/CustomizeBuffetLevelScreen.mapping index 199e7b6fe5..ec8d1f1ed7 100644 --- a/mappings/net/minecraft/client/gui/screen/CustomizeBuffetLevelScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/CustomizeBuffetLevelScreen.mapping @@ -22,6 +22,10 @@ CLASS net/minecraft/class_415 net/minecraft/client/gui/screen/CustomizeBuffetLev FIELD field_18736 screen Lnet/minecraft/class_415; METHOD method_28060 (Ljava/util/Map$Entry;)Lnet/minecraft/class_415$class_4190$class_4191; ARG 1 entry + METHOD method_40075 (Lnet/minecraft/class_415$class_4190;Lnet/minecraft/class_350$class_351;)V + ARG 1 entry + METHOD method_40076 (Lnet/minecraft/class_415$class_4190$class_4191;)Ljava/lang/String; + ARG 0 biome CLASS class_4191 BuffetBiomeItem FIELD field_24564 biome Lnet/minecraft/class_1959; FIELD field_26536 text Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/datafixer/fix/WeaponsmithChestLootTableFix.mapping b/mappings/net/minecraft/datafixer/fix/WeaponsmithChestLootTableFix.mapping new file mode 100644 index 0000000000..8c08fdc6e7 --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/WeaponsmithChestLootTableFix.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_6858 net/minecraft/datafixer/fix/WeaponsmithChestLootTableFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType + METHOD method_40070 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 dynamic diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index bdedf95788..715b9d0588 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -449,6 +449,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_38785 onLanding ()V METHOD method_39759 hasCollidedSoftly (Lnet/minecraft/class_243;)Z ARG 1 adjustedMovement + METHOD method_40071 shouldEscapePowderSnow ()Z METHOD method_5621 getMountedHeightOffset ()D METHOD method_5622 onBlockCollision (Lnet/minecraft/class_2680;)V ARG 1 state diff --git a/mappings/net/minecraft/entity/ai/goal/EscapeDangerGoal.mapping b/mappings/net/minecraft/entity/ai/goal/EscapeDangerGoal.mapping index 867e92302b..17f30bf68e 100644 --- a/mappings/net/minecraft/entity/ai/goal/EscapeDangerGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/EscapeDangerGoal.mapping @@ -9,8 +9,11 @@ CLASS net/minecraft/class_1374 net/minecraft/entity/ai/goal/EscapeDangerGoal ARG 1 mob ARG 2 speed METHOD method_26337 isActive ()Z + METHOD method_39764 (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z + ARG 1 pos + METHOD method_40072 isInDanger ()Z METHOD method_6300 locateClosestWater (Lnet/minecraft/class_1922;Lnet/minecraft/class_1297;I)Lnet/minecraft/class_2338; - ARG 1 blockView + ARG 1 world ARG 2 entity ARG 3 rangeX METHOD method_6301 findTarget ()Z diff --git a/mappings/net/minecraft/entity/passive/PandaEntity.mapping b/mappings/net/minecraft/entity/passive/PandaEntity.mapping index dd03459cfc..38eb1c8707 100644 --- a/mappings/net/minecraft/entity/passive/PandaEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PandaEntity.mapping @@ -142,7 +142,7 @@ CLASS net/minecraft/class_1440 net/minecraft/entity/passive/PandaEntity FIELD field_6801 panda Lnet/minecraft/class_1440; METHOD (Lnet/minecraft/class_1440;)V ARG 1 panda - CLASS class_1447 ExtinguishFireGoal + CLASS class_1447 PandaEscapeDangerGoal FIELD field_6802 panda Lnet/minecraft/class_1440; METHOD (Lnet/minecraft/class_1440;D)V ARG 1 panda diff --git a/mappings/net/minecraft/entity/passive/WolfEntity.mapping b/mappings/net/minecraft/entity/passive/WolfEntity.mapping index 3cc96d6f3a..1206f9999c 100644 --- a/mappings/net/minecraft/entity/passive/WolfEntity.mapping +++ b/mappings/net/minecraft/entity/passive/WolfEntity.mapping @@ -57,3 +57,6 @@ CLASS net/minecraft/class_1493 net/minecraft/entity/passive/WolfEntity ARG 7 fastSpeed METHOD method_6720 isScaredOf (Lnet/minecraft/class_1501;)Z ARG 1 llama + CLASS class_6859 WolfEscapeDangerGoal + METHOD (Lnet/minecraft/class_1493;D)V + ARG 2 speed diff --git a/mappings/net/minecraft/server/world/ChunkHolder.mapping b/mappings/net/minecraft/server/world/ChunkHolder.mapping index 62c4097b5e..5c4685ae07 100644 --- a/mappings/net/minecraft/server/world/ChunkHolder.mapping +++ b/mappings/net/minecraft/server/world/ChunkHolder.mapping @@ -96,6 +96,7 @@ CLASS net/minecraft/class_3193 net/minecraft/server/world/ChunkHolder METHOD method_39967 combineSavingFuture (Ljava/lang/String;Ljava/util/concurrent/CompletableFuture;)V ARG 1 thenDesc ARG 2 then + METHOD method_40066 collectFuturesByStatus ()Ljava/util/List; CLASS class_3194 LevelType METHOD method_14014 isAfter (Lnet/minecraft/class_3193$class_3194;)Z ARG 1 levelType diff --git a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping index 59fac6040e..8fc3f44582 100644 --- a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping +++ b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping @@ -31,6 +31,7 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor FIELD field_29671 PROTO_CHUNK B FIELD field_29672 UNMARKED_CHUNK B FIELD field_29673 LEVEL_CHUNK B + FIELD field_36383 chunkToNextSaveTimeMs Lit/unimi/dsi/fastutil/longs/Long2LongMap; METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_3485;Ljava/util/concurrent/Executor;Lnet/minecraft/class_1255;Lnet/minecraft/class_2823;Lnet/minecraft/class_2794;Lnet/minecraft/class_3949;Lnet/minecraft/class_5567;Ljava/util/function/Supplier;IZ)V ARG 1 world ARG 2 session @@ -259,6 +260,12 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor ARG 2 x2 ARG 3 z2 ARG 4 distance + METHOD method_40067 crash (Ljava/lang/IllegalStateException;)V + ARG 1 exception + METHOD method_40068 (Ljava/lang/StringBuilder;Lnet/minecraft/class_3193;)V + ARG 1 chunkHolder + METHOD method_40069 (Ljava/lang/StringBuilder;Lnet/minecraft/class_3193;Lcom/mojang/datafixers/util/Pair;)V + ARG 2 pair 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/util/math/Vec3i.mapping b/mappings/net/minecraft/util/math/Vec3i.mapping index 2b3e6571d0..f554378e67 100644 --- a/mappings/net/minecraft/util/math/Vec3i.mapping +++ b/mappings/net/minecraft/util/math/Vec3i.mapping @@ -43,11 +43,10 @@ CLASS net/minecraft/class_2382 net/minecraft/util/math/Vec3i ARG 1 vec METHOD method_10263 getX ()I METHOD method_10264 getY ()I - METHOD method_10268 getSquaredDistance (DDD)D - COMMENT {@return the squared distance between here (center or vertex) and {@code (x, y, z)}} - COMMENT If {@code center} is {@code true}, this is equivalent to {@link Vec3d#ofCenter(Vec3i) - COMMENT Vec3d.ofCenter(this).squaredDistanceTo(x, y, z)}; otherwise, - COMMENT this is equivalent to {@code Vec3d.of(this).squaredDistanceTo(x, y, z)}. + METHOD method_10268 getSquaredDistanceFromCenter (DDD)D + COMMENT {@return the squared distance between the center of this voxel and {@code (x, y, z)}} + COMMENT This is equivalent to {@link Vec3d#ofCenter(Vec3i) + COMMENT Vec3d.ofCenter(this).squaredDistanceTo(x, y, z)}. ARG 1 x ARG 3 y ARG 5 z @@ -175,3 +174,9 @@ CLASS net/minecraft/class_2382 net/minecraft/util/math/Vec3i ARG 1 vec METHOD method_39677 createOffsetCodec (I)Lcom/mojang/serialization/Codec; ARG 0 maxAbsValue + METHOD method_40081 getSquaredDistance (DDD)D + COMMENT {@return the squared distance between here and {@code (x, y, z)}} + COMMENT This is equivalent to {@code Vec3d.of(this).squaredDistanceTo(x, y, z)}. + ARG 1 x + ARG 3 y + ARG 5 z diff --git a/mappings/net/minecraft/world/gen/feature/ConfiguredFeature.mapping b/mappings/net/minecraft/world/gen/feature/ConfiguredFeature.mapping index 2dc5af00a4..0b93b3e54b 100644 --- a/mappings/net/minecraft/world/gen/feature/ConfiguredFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/ConfiguredFeature.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_2975 net/minecraft/world/gen/feature/ConfiguredFeature FIELD field_24833 REGISTRY_CODEC Lcom/mojang/serialization/Codec; FIELD field_25833 CODEC Lcom/mojang/serialization/Codec; FIELD field_26756 LIST_CODEC Lcom/mojang/serialization/Codec; + FIELD field_36386 NETWORK_CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_3031;Lnet/minecraft/class_3037;)V ARG 1 feature ARG 2 config diff --git a/mappings/net/minecraft/world/gen/feature/util/DripstoneHelper.mapping b/mappings/net/minecraft/world/gen/feature/util/DripstoneHelper.mapping index 4413b0e9bd..72f14122ab 100644 --- a/mappings/net/minecraft/world/gen/feature/util/DripstoneHelper.mapping +++ b/mappings/net/minecraft/world/gen/feature/util/DripstoneHelper.mapping @@ -41,3 +41,5 @@ CLASS net/minecraft/class_5726 net/minecraft/world/gen/feature/util/DripstoneHel ARG 1 pos METHOD method_33389 canGenerateOrLava (Lnet/minecraft/class_2680;)Z ARG 0 state + METHOD method_40074 cannotGenerate (Lnet/minecraft/class_2680;)Z + ARG 0 state