Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

23w40a misc #3687

Merged
merged 2 commits into from
Oct 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion mappings/net/minecraft/block/AbstractCauldronBlock.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 1 addition & 9 deletions mappings/net/minecraft/block/LeveledCauldronBlock.mapping
Original file line number Diff line number Diff line change
@@ -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 <p>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
Expand All @@ -14,9 +9,6 @@ CLASS net/minecraft/class_5556 net/minecraft/block/LeveledCauldronBlock
FIELD field_46384 precipitation Lnet/minecraft/class_1959$class_1963;
METHOD <init> (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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
16 changes: 16 additions & 0 deletions mappings/net/minecraft/datafixer/fix/TextFixes.mapping
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions mappings/net/minecraft/entity/LivingEntity.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
CLASS net/minecraft/class_1322 net/minecraft/entity/attribute/EntityAttributeModifier
FIELD field_23712 LOGGER Lorg/slf4j/Logger;
FIELD field_46247 CODEC Lcom/mojang/serialization/Codec;
FIELD field_46248 name Ljava/lang/String;
FIELD field_6323 value D
FIELD field_6324 operation Lnet/minecraft/class_1322$class_1323;
FIELD field_6327 uuid Ljava/util/UUID;
Expand All @@ -8,12 +10,19 @@ CLASS net/minecraft/class_1322 net/minecraft/entity/attribute/EntityAttributeMod
ARG 2 value
ARG 4 operation
METHOD <init> (Ljava/util/UUID;Ljava/lang/String;DLnet/minecraft/class_1322$class_1323;)V
ARG 1 uuid
ARG 2 name
ARG 3 value
ARG 5 operation
METHOD equals (Ljava/lang/Object;)Z
ARG 1 o
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;
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/entity/player/PlayerEntity.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
29 changes: 17 additions & 12 deletions mappings/net/minecraft/network/PacketByteBuf.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 <init> (Lnet/minecraft/class_2540;)V
ARG 1 buf
METHOD <init> (Lnet/minecraft/class_2668$class_5402;F)V
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/registry/SimpleRegistry.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/server/command/KickCommand.mapping
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 7 additions & 0 deletions mappings/net/minecraft/server/command/TestCommand.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions mappings/net/minecraft/test/GameTestState.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ CLASS net/minecraft/class_4517 net/minecraft/test/GameTestState
FIELD field_21456 stopwatch Lcom/google/common/base/Stopwatch;
FIELD field_25301 rotation Lnet/minecraft/class_2470;
FIELD field_27805 structureBlockEntity Lnet/minecraft/class_2633;
FIELD field_46593 rerunUntilFailed Z
METHOD <init> (Lnet/minecraft/class_4529;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;)V
ARG 1 testFunction
ARG 2 rotation
Expand Down Expand Up @@ -69,3 +70,6 @@ CLASS net/minecraft/class_4517 net/minecraft/test/GameTestState
METHOD method_36065 getTick ()J
METHOD method_36066 createTimedTaskRunner ()Lnet/minecraft/class_4693;
METHOD method_36067 getTicksLeft ()I
METHOD method_54145 shouldRerunUntilFailed ()Z
METHOD method_54146 setRerunUntilFailed (Z)V
ARG 1 rerunUntilFailed
4 changes: 4 additions & 0 deletions mappings/net/minecraft/test/TestContext.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -378,3 +378,7 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext
ARG 1 entity
ARG 2 effect
ARG 3 amplifier
METHOD method_54143 expectItem (Lnet/minecraft/class_1792;)V
ARG 1 item
METHOD method_54144 dontExpectItem (Lnet/minecraft/class_1792;)V
ARG 1 item
7 changes: 7 additions & 0 deletions mappings/net/minecraft/util/math/MathHelper.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper
COMMENT
COMMENT <p>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
Expand Down Expand Up @@ -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