From 0634ed42874922401490bdebdc6ac49ec045fd80 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Sat, 7 Oct 2023 01:00:37 +0900 Subject: [PATCH] 23w40a misc (#3687) * 23w40a misc * Remove obsolete javadoc --- .../block/AbstractCauldronBlock.mapping | 1 - .../block/LeveledCauldronBlock.mapping | 10 +------ .../argument/NbtPathArgumentType.mapping | 3 ++ .../minecraft/datafixer/fix/TextFixes.mapping | 16 ++++++++++ .../net/minecraft/entity/LivingEntity.mapping | 2 ++ .../attribute/EntityAttributeModifier.mapping | 4 +++ .../entity/player/PlayerEntity.mapping | 2 ++ .../minecraft/network/PacketByteBuf.mapping | 29 +++++++++++-------- .../s2c/play/GameStateChangeS2CPacket.mapping | 1 + .../minecraft/registry/SimpleRegistry.mapping | 2 ++ .../server/command/KickCommand.mapping | 1 + .../server/command/TestCommand.mapping | 7 +++++ .../minecraft/util/math/MathHelper.mapping | 7 +++++ 13 files changed, 63 insertions(+), 22 deletions(-) create mode 100644 mappings/net/minecraft/datafixer/fix/TextFixes.mapping diff --git a/mappings/net/minecraft/block/AbstractCauldronBlock.mapping b/mappings/net/minecraft/block/AbstractCauldronBlock.mapping index 2704eb0a2d..a4a2df3f4b 100644 --- a/mappings/net/minecraft/block/AbstractCauldronBlock.mapping +++ b/mappings/net/minecraft/block/AbstractCauldronBlock.mapping @@ -7,7 +7,6 @@ CLASS net/minecraft/class_2275 net/minecraft/block/AbstractCauldronBlock COMMENT @see CauldronBlock empty cauldrons COMMENT @see LavaCauldronBlock cauldrons filled with lava COMMENT @see LeveledCauldronBlock cauldrons with varying levels of contents - COMMENT @see PowderSnowCauldronBlock cauldrons filled with powder snow FIELD field_10746 OUTLINE_SHAPE Lnet/minecraft/class_265; FIELD field_10747 RAYCAST_SHAPE Lnet/minecraft/class_265; FIELD field_27084 behaviorMap Lnet/minecraft/class_5620$class_8821; diff --git a/mappings/net/minecraft/block/LeveledCauldronBlock.mapping b/mappings/net/minecraft/block/LeveledCauldronBlock.mapping index 472ab40ecf..2a239cf2d6 100644 --- a/mappings/net/minecraft/block/LeveledCauldronBlock.mapping +++ b/mappings/net/minecraft/block/LeveledCauldronBlock.mapping @@ -1,10 +1,5 @@ CLASS net/minecraft/class_5556 net/minecraft/block/LeveledCauldronBlock - COMMENT A cauldron with a varying level of contents. - COMMENT This includes water and powder snow cauldrons. - COMMENT - COMMENT

The amount of stored substance is controlled with the {@link #LEVEL} - COMMENT block state property which can take values between {@value #MIN_LEVEL} and - COMMENT {@value #MAX_LEVEL} (inclusive). + COMMENT Constructs a leveled cauldron block. FIELD field_27206 LEVEL Lnet/minecraft/class_2758; FIELD field_31107 MIN_LEVEL I FIELD field_31108 MAX_LEVEL I @@ -14,9 +9,6 @@ CLASS net/minecraft/class_5556 net/minecraft/block/LeveledCauldronBlock FIELD field_46384 precipitation Lnet/minecraft/class_1959$class_1963; METHOD (Lnet/minecraft/class_1959$class_1963;Lnet/minecraft/class_5620$class_8821;Lnet/minecraft/class_4970$class_2251;)V COMMENT Constructs a leveled cauldron block. - COMMENT - COMMENT @apiNote The precipitation predicates are compared using identity comparisons in some cases, - COMMENT so callers should typically use {@link #RAIN_PREDICATE} and {@link #SNOW_PREDICATE} if applicable. ARG 1 precipitation ARG 2 behaviorMap ARG 3 settings diff --git a/mappings/net/minecraft/command/argument/NbtPathArgumentType.mapping b/mappings/net/minecraft/command/argument/NbtPathArgumentType.mapping index 93b2fb62dc..34cc4fd8de 100644 --- a/mappings/net/minecraft/command/argument/NbtPathArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/NbtPathArgumentType.mapping @@ -77,9 +77,12 @@ CLASS net/minecraft/class_2203 net/minecraft/command/argument/NbtPathArgumentTyp ARG 1 index ARG 2 compound ARG 3 elements + METHOD method_47973 (Lnet/minecraft/class_2203$class_2210;Lorg/apache/commons/lang3/mutable/MutableBoolean;Lnet/minecraft/class_2520;Lnet/minecraft/class_2520;)Ljava/lang/Integer; + ARG 3 nbt METHOD method_47975 isTooDeep (Lnet/minecraft/class_2520;I)Z ARG 0 element ARG 1 depth + METHOD method_54100 getString ()Ljava/lang/String; METHOD method_9366 get (Lnet/minecraft/class_2520;)Ljava/util/List; ARG 1 element METHOD method_9367 getOrInit (Lnet/minecraft/class_2520;Ljava/util/function/Supplier;)Ljava/util/List; diff --git a/mappings/net/minecraft/datafixer/fix/TextFixes.mapping b/mappings/net/minecraft/datafixer/fix/TextFixes.mapping new file mode 100644 index 0000000000..e4f851f859 --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/TextFixes.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/class_8809 net/minecraft/datafixer/fix/TextFixes + FIELD field_46246 EMPTY_TEXT Ljava/lang/String; + METHOD method_53958 fixText (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 dynamic + METHOD method_53959 (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic; + ARG 1 string + METHOD method_53960 empty (Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/Dynamic; + ARG 0 ops + METHOD method_53961 text (Lcom/mojang/serialization/DynamicOps;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic; + ARG 0 ops + ARG 1 string + METHOD method_53962 text (Ljava/lang/String;)Ljava/lang/String; + ARG 0 string + METHOD method_53963 translate (Lcom/mojang/serialization/DynamicOps;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic; + ARG 0 ops + ARG 1 key diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 9a2e719325..10ddea31ae 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -367,6 +367,8 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity COMMENT Gets the area in which this entity can be attacked by mobs whose attack box overlaps it. COMMENT COMMENT @see net.minecraft.entity.mob.MobEntity#getAttackBox + METHOD method_53964 getMaxRelativeHeadRotation ()F + COMMENT {@return the maximum rotation of the head relative to the body in degrees} METHOD method_5973 canTarget (Lnet/minecraft/class_1299;)Z ARG 1 type METHOD method_5989 getLootTable ()Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping b/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping index 46a1a9d63a..0671d02fad 100644 --- a/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping +++ b/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping @@ -19,6 +19,10 @@ CLASS net/minecraft/class_1322 net/minecraft/entity/attribute/EntityAttributeMod METHOD method_26859 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1322; ARG 0 nbt METHOD method_26860 toNbt ()Lnet/minecraft/class_2487; + METHOD method_53965 (Lnet/minecraft/class_1322;)Ljava/lang/String; + ARG 0 modifier + METHOD method_53966 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_6182 getOperation ()Lnet/minecraft/class_1322$class_1323; METHOD method_6186 getValue ()D METHOD method_6189 getId ()Ljava/util/UUID; diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index d18b714ab6..3ed2526665 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -134,6 +134,8 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity ARG 2 ingredients METHOD method_52558 canChangeIntoPose (Lnet/minecraft/class_4050;)Z ARG 1 pose + METHOD method_53967 (I)Z + ARG 0 c METHOD method_53968 isUsernameValid (Ljava/lang/String;)Z ARG 0 name METHOD method_7254 unlockRecipes (Ljava/util/Collection;)I diff --git a/mappings/net/minecraft/network/PacketByteBuf.mapping b/mappings/net/minecraft/network/PacketByteBuf.mapping index 4e4ab9ddb1..c4db57aae4 100644 --- a/mappings/net/minecraft/network/PacketByteBuf.mapping +++ b/mappings/net/minecraft/network/PacketByteBuf.mapping @@ -388,7 +388,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT COMMENT @return the read compound, may be {@code null} COMMENT @throws io.netty.handler.codec.EncoderException if the NBT cannot be read - COMMENT @throws RuntimeException if the compound exceeds the allowed maximum size + COMMENT @throws net.minecraft.nbt.NbtSizeValidationException if the compound exceeds the allowed maximum size COMMENT @see #writeNbt(NbtCompound) COMMENT @see #readNbt(NbtTagSizeTracker) COMMENT @see #MAX_READ_NBT_SIZE @@ -465,14 +465,11 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf ARG 1 value COMMENT the value to write METHOD method_10805 writeText (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2540; - COMMENT Writes a text to this buf. A text is represented by a JSON string with - COMMENT max length {@value #MAX_TEXT_LENGTH}. + COMMENT Writes a text to this buf. A text is represented as an NBT-encoded data. COMMENT COMMENT @return this buf, for chaining - COMMENT @throws io.netty.handler.codec.EncoderException if the JSON string - COMMENT written exceeds {@value #MAX_TEXT_LENGTH} in length COMMENT @see #readText() - COMMENT @see #MAX_TEXT_LENGTH + COMMENT @see #readUnlimitedText() ARG 1 text COMMENT the text to write METHOD method_10806 writeIntArray ([I)Lnet/minecraft/class_2540; @@ -496,14 +493,15 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf ARG 1 pos COMMENT the pos to write METHOD method_10808 readText ()Lnet/minecraft/class_2561; - COMMENT Reads a text from this buf. A text is represented by a JSON string with - COMMENT max length {@value #MAX_TEXT_LENGTH}. + COMMENT Reads a text from this buf. A text is represented as an NBT-encoded data + COMMENT with {@linkplain NbtTagSizeTracker the maximum size} as {@value #MAX_READ_NBT_SIZE}. COMMENT COMMENT @return the read text - COMMENT @throws io.netty.handler.codec.DecoderException if the JSON string read - COMMENT exceeds {@value #MAX_TEXT_LENGTH} in length + COMMENT @throws io.netty.handler.codec.EncoderException if the NBT cannot be read + COMMENT @throws net.minecraft.nbt.NbtSizeValidationException if the serialized text is too big + COMMENT @see #readUnlimitedText() COMMENT @see #writeText(Text) - COMMENT @see #MAX_TEXT_LENGTH + COMMENT @see #MAX_READ_NBT_SIZE METHOD method_10809 readLongArray ([JI)[J COMMENT Reads an array of primitive longs from this buf. The array first has a COMMENT var int indicating its length, followed by the regular long (not var @@ -661,7 +659,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT COMMENT @return the read element, may be {@code null} COMMENT @throws io.netty.handler.codec.EncoderException if the NBT cannot be read - COMMENT @throws RuntimeException if the element exceeds the allowed maximum size + COMMENT @throws net.minecraft.nbt.NbtSizeValidationException if the element exceeds the allowed maximum size COMMENT @see #writeNbt(NbtElement) COMMENT @see #readNbt() ARG 1 sizeTracker @@ -1119,6 +1117,13 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT @return the read registry key COMMENT @see #readRegistryKey(RegistryKey) COMMENT @see #writeRegistryKey(RegistryKey) + METHOD method_54148 readUnlimitedText ()Lnet/minecraft/class_2561; + COMMENT Reads a text from this buf. A text is represented as an NBT-encoded data. + COMMENT Unlike {@link #readText()}, this method can read an unlimited amount of text. + COMMENT + COMMENT @return the read text + COMMENT @see #readText() + COMMENT @see #writeText(Text) METHOD nioBuffer (II)Ljava/nio/ByteBuffer; ARG 1 index ARG 2 length diff --git a/mappings/net/minecraft/network/packet/s2c/play/GameStateChangeS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/GameStateChangeS2CPacket.mapping index 01a9a23fe3..f1363de605 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/GameStateChangeS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/GameStateChangeS2CPacket.mapping @@ -19,6 +19,7 @@ CLASS net/minecraft/class_2668 net/minecraft/network/packet/s2c/play/GameStateCh FIELD field_33331 DEMO_INVENTORY_HELP I FIELD field_33332 DEMO_EXPIRY_NOTICE I FIELD field_46189 LIMITED_CRAFTING_TOGGLED Lnet/minecraft/class_2668$class_5402; + FIELD field_46637 INITIAL_CHUNKS_COMING Lnet/minecraft/class_2668$class_5402; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD (Lnet/minecraft/class_2668$class_5402;F)V diff --git a/mappings/net/minecraft/registry/SimpleRegistry.mapping b/mappings/net/minecraft/registry/SimpleRegistry.mapping index 2fa4b62d2d..5b3beee8fe 100644 --- a/mappings/net/minecraft/registry/SimpleRegistry.mapping +++ b/mappings/net/minecraft/registry/SimpleRegistry.mapping @@ -25,6 +25,8 @@ CLASS net/minecraft/class_2370 net/minecraft/registry/SimpleRegistry ARG 1 key ARG 2 lifecycle ARG 3 intrusive + METHOD method_39665 (Lit/unimi/dsi/fastutil/objects/Reference2IntOpenHashMap;)V + ARG 0 map METHOD method_40253 getValue (Lnet/minecraft/class_6880$class_6883;)Ljava/lang/Object; ARG 0 entry METHOD method_40255 (Lnet/minecraft/class_6885$class_6888;)V diff --git a/mappings/net/minecraft/server/command/KickCommand.mapping b/mappings/net/minecraft/server/command/KickCommand.mapping index 20516b7f00..05ae3a46a9 100644 --- a/mappings/net/minecraft/server/command/KickCommand.mapping +++ b/mappings/net/minecraft/server/command/KickCommand.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_3073 net/minecraft/server/command/KickCommand + FIELD field_46229 CANNOT_KICK_OWNER_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; METHOD method_13409 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context METHOD method_13410 register (Lcom/mojang/brigadier/CommandDispatcher;)V diff --git a/mappings/net/minecraft/server/command/TestCommand.mapping b/mappings/net/minecraft/server/command/TestCommand.mapping index 20333dbfc3..88157f46bb 100644 --- a/mappings/net/minecraft/server/command/TestCommand.mapping +++ b/mappings/net/minecraft/server/command/TestCommand.mapping @@ -35,6 +35,9 @@ CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand ARG 0 world ARG 1 pos ARG 2 tests + ARG 3 rerunUntilFailed + METHOD method_22274 (Lnet/minecraft/class_3218;Lnet/minecraft/class_4524;ZLnet/minecraft/class_2338;)V + ARG 3 pos METHOD method_22275 sendMessage (Lnet/minecraft/class_3218;Ljava/lang/String;Lnet/minecraft/class_124;)V ARG 0 world ARG 1 message @@ -43,6 +46,7 @@ CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand ARG 0 player METHOD method_22277 executeRunThis (Lnet/minecraft/class_2168;Z)I ARG 0 source + ARG 1 rerunUntilFailed METHOD method_22278 sendMessage (Lnet/minecraft/class_2168;Ljava/lang/String;)V ARG 0 source ARG 1 message @@ -53,6 +57,7 @@ CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand ARG 1 tests METHOD method_22281 executeRunThese (Lnet/minecraft/class_2168;Z)I ARG 0 source + ARG 1 rerunUntilFailed METHOD method_22282 executeExport (Lnet/minecraft/class_2168;Ljava/lang/String;)I ARG 0 source ARG 1 testName @@ -123,6 +128,8 @@ CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand ARG 0 source METHOD method_52891 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context + METHOD method_54147 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context CLASS class_4528 Listener FIELD field_20581 world Lnet/minecraft/class_3218; FIELD field_20582 tests Lnet/minecraft/class_4524; diff --git a/mappings/net/minecraft/util/math/MathHelper.mapping b/mappings/net/minecraft/util/math/MathHelper.mapping index 49d192488f..353bd27f70 100644 --- a/mappings/net/minecraft/util/math/MathHelper.mapping +++ b/mappings/net/minecraft/util/math/MathHelper.mapping @@ -48,6 +48,9 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper COMMENT COMMENT

These tables have 257 elements because they store values for multiples of COMMENT 1/256 from 0 to 1, inclusive. + FIELD field_46242 Y_AXIS Lorg/joml/Vector3f; + FIELD field_46243 X_AXIS Lorg/joml/Vector3f; + FIELD field_46244 Z_AXIS Lorg/joml/Vector3f; METHOD method_15338 wrapDegrees (D)D COMMENT Wraps an angle in degrees to the interval {@code [-180, 180)}. ARG 0 degrees @@ -518,3 +521,7 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper ARG 0 delta ARG 1 start ARG 2 end + METHOD method_53948 rotateAround (Lorg/joml/Vector3f;Lorg/joml/Quaternionf;Lorg/joml/Quaternionf;)Lorg/joml/Quaternionf; + ARG 0 axis + ARG 1 rotation + ARG 2 result