diff --git a/build.gradle b/build.gradle
index 3da9dab4bd..42165b0e00 100644
--- a/build.gradle
+++ b/build.gradle
@@ -219,16 +219,16 @@ task buildIntermediary {
task eraseBytecode(type: TransformJarClassesTask, dependsOn: mapNamedJar) {
jarFile = mappings.fileConstants.namedJar
output = file(".gradle/temp/erased-classes/")
- // TODO: https://github.com/Vineflower/vineflower/issues/297
- visitor { new ClassVisitor(Opcodes.ASM9, it) {
- @Override
- void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
- if (superName == "java/lang/Record") {
- access |= Opcodes.ACC_RECORD
- }
- super.visit(version, access, name, signature, superName, interfaces)
- }
- } }
+ // TODO: https://github.com/Vineflower/vineflower/issues/297
+ visitor { new ClassVisitor(Opcodes.ASM9, it) {
+ @Override
+ void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
+ if (superName == "java/lang/Record") {
+ access |= Opcodes.ACC_RECORD
+ }
+ super.visit(version, access, name, signature, superName, interfaces)
+ }
+ } }
visitor(DraftsmanAdapterClassVisitor::new)
// Set protected/package-private classes to public so that we don't have any access compile errors.
diff --git a/mappings/net/minecraft/network/PacketByteBuf.mapping b/mappings/net/minecraft/network/PacketByteBuf.mapping
index 191271c0c8..864757f0d1 100644
--- a/mappings/net/minecraft/network/PacketByteBuf.mapping
+++ b/mappings/net/minecraft/network/PacketByteBuf.mapping
@@ -478,7 +478,6 @@ CLASS net/minecraft/unmapped/C_idfydwco net/minecraft/network/PacketByteBuf
COMMENT
COMMENT @return this buf, for chaining
COMMENT @see #readVarLong()
- COMMENT @see #getVarLongLength(long)
ARG 1 value
COMMENT the value to write
METHOD m_hwjipexh writeIntList (Lit/unimi/dsi/fastutil/ints/IntList;)V
@@ -510,7 +509,6 @@ CLASS net/minecraft/unmapped/C_idfydwco net/minecraft/network/PacketByteBuf
COMMENT @throws io.netty.handler.codec.EncoderException if the NBT cannot be
COMMENT written
COMMENT @see #readNbt()
- COMMENT @see #readUnlimitedNbt()
COMMENT @see #readNbt(NbtTagSizeTracker)
METHOD m_jrgknvio decode (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Codec;Lnet/minecraft/unmapped/C_fozrrtcx;)Ljava/lang/Object;
COMMENT Reads an object from this buf as a compound NBT with the given codec.
@@ -539,7 +537,6 @@ CLASS net/minecraft/unmapped/C_idfydwco net/minecraft/network/PacketByteBuf
COMMENT
COMMENT @return this buf, for chaining
COMMENT @see #readVarInt()
- COMMENT @see #getVarIntLength(int)
ARG 1 value
COMMENT the value to write
METHOD m_kooigoir readInstant ()Ljava/time/Instant;
@@ -751,7 +748,6 @@ CLASS net/minecraft/unmapped/C_idfydwco net/minecraft/network/PacketByteBuf
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 @see #writeNbt(NbtCompound)
- COMMENT @see #readUnlimitedNbt()
COMMENT @see #readNbt(NbtTagSizeTracker)
COMMENT @see #MAX_READ_NBT_SIZE
METHOD m_sxbdiyar readOptional (Lnet/minecraft/unmapped/C_idfydwco$C_qteuvzud;)Ljava/util/Optional;
@@ -788,6 +784,8 @@ CLASS net/minecraft/unmapped/C_idfydwco net/minecraft/network/PacketByteBuf
COMMENT the block hit result to write
METHOD m_tuovdjxm (Lnet/minecraft/unmapped/C_idfydwco$C_urseyllo;Ljava/lang/Object;)V
ARG 2 object
+ METHOD m_ucosefkt decode (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Codec;)Ljava/lang/Object;
+ METHOD m_uedohhct readNbt (Lnet/minecraft/unmapped/C_fozrrtcx;)Lnet/minecraft/unmapped/C_oivssbvb;
METHOD m_uvlqpwrk readLongArray ([J)[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
diff --git a/mappings/net/minecraft/server/function/CommandFunctionManager.mapping b/mappings/net/minecraft/server/function/CommandFunctionManager.mapping
index c644e07237..d942cae3c9 100644
--- a/mappings/net/minecraft/server/function/CommandFunctionManager.mapping
+++ b/mappings/net/minecraft/server/function/CommandFunctionManager.mapping
@@ -50,14 +50,15 @@ CLASS net/minecraft/unmapped/C_nbwcoknw net/minecraft/server/function/CommandFun
COMMENT Executes a function.
COMMENT
COMMENT This is same as calling {@link #execute(CommandFunction, ServerCommandSource,
- COMMENT Tracer) execute(function, source, null)}.
+ COMMENT Tracer, NbtCompound) execute(function, source, null, null)}.
COMMENT
COMMENT @return the command output value
- COMMENT @see #execute(CommandFunction, ServerCommandSource, Tracer)
+ COMMENT @see #execute(CommandFunction, ServerCommandSource, Tracer, NbtCompound)
ARG 1 function
COMMENT the function
ARG 2 source
COMMENT the command source to execute with
+ METHOD m_trgeoxeb execute (Lnet/minecraft/unmapped/C_soipoenw;Lnet/minecraft/unmapped/C_pennblrk;Lnet/minecraft/unmapped/C_nbwcoknw$C_ihdownls;Lnet/minecraft/unmapped/C_hhlwcnih;)I
METHOD m_wcucalqh getTag (Lnet/minecraft/unmapped/C_ncpywfca;)Ljava/util/Collection;
ARG 1 id
CLASS C_hkyyjgwj Entry
@@ -105,7 +106,7 @@ CLASS net/minecraft/unmapped/C_nbwcoknw net/minecraft/server/function/CommandFun
ARG 1 message
METHOD m_jtwxlovt run (Lnet/minecraft/unmapped/C_soipoenw;Lnet/minecraft/unmapped/C_pennblrk;)I
COMMENT Handles a new case in {@link CommandFunctionManager#execute(CommandFunction,
- COMMENT ServerCommandSource, CommandFunctionManager.Tracer)}.
+ COMMENT ServerCommandSource, CommandFunctionManager.Tracer, NbtCompound)}.
COMMENT
COMMENT @return a value for the command result
ARG 1 function
@@ -114,7 +115,7 @@ CLASS net/minecraft/unmapped/C_nbwcoknw net/minecraft/server/function/CommandFun
COMMENT the command source
METHOD m_pjvwrxbj recursiveRun (Lnet/minecraft/unmapped/C_soipoenw;Lnet/minecraft/unmapped/C_pennblrk;)V
COMMENT Handles a recursive case in {@link CommandFunctionManager#execute(CommandFunction,
- COMMENT ServerCommandSource, CommandFunctionManager.Tracer)}.
+ COMMENT ServerCommandSource, CommandFunctionManager.Tracer, NbtCompound)}.
COMMENT
COMMENT
This effectively swaps an entry with a command element with {@code /function}
COMMENT command at the head of the deque with another entry with a function element
diff --git a/mappings/net/minecraft/world/WorldEvents.mapping b/mappings/net/minecraft/world/WorldEvents.mapping
index ad93ef8ae5..fc96e731c4 100644
--- a/mappings/net/minecraft/world/WorldEvents.mapping
+++ b/mappings/net/minecraft/world/WorldEvents.mapping
@@ -306,7 +306,7 @@ CLASS net/minecraft/unmapped/C_kkbhcwdu net/minecraft/world/WorldEvents
COMMENT {@link net.minecraft.block.CarvedPumpkinBlock#trySpawnEntity(net.minecraft.world.World, net.minecraft.util.math.BlockPos) CarvedPumpkinBlock#trySpawnEntity},
COMMENT {@link net.minecraft.entity.ai.goal.EatGrassGoal#tick() EatGrassGoal#tick},
COMMENT {@link net.minecraft.entity.passive.FoxEntity#tick() FoxEntity#tick},
- COMMENT {@link net.minecraft.block.PowderSnowBlock#tryDrainFluid(net.minecraft.world.WorldAccess, net.minecraft.util.math.BlockPos, net.minecraft.block.BlockState) PowderSnowBlock#tryDrainFluid},
+ COMMENT {@link net.minecraft.block.PowderSnowBlock#tryDrainFluid(net.minecraft.entity.player.PlayerEntity, net.minecraft.world.WorldAccess, net.minecraft.util.math.BlockPos, net.minecraft.block.BlockState) PowderSnowBlock#tryDrainFluid},
COMMENT {@link net.minecraft.entity.passive.RabbitEntity.EatCarrotCropGoal#tick() RabbitEntity.EatCarrotCropGoal#tick},
COMMENT {@link net.minecraft.block.SpongeBlock#update(net.minecraft.world.World, net.minecraft.util.math.BlockPos) SpongeBlock#update},
COMMENT {@link net.minecraft.block.TurtleEggBlock#breakEgg(net.minecraft.world.World, net.minecraft.util.math.BlockPos, net.minecraft.block.BlockState) TurtleEggBlock#breakEgg},