Fix /assert entity showing null instead of the entity selector

Author: misode

src/main/java/io/github/misode/packtest/mixin/BlockPredicateArgumentMixin.java

@@ -7,6 +7,8 @@
 import com.mojang.brigadier.StringReader;
 import io.github.misode.packtest.PackTestArgumentSource;
 import net.minecraft.commands.arguments.blocks.BlockPredicateArgument;
+import net.minecraft.core.HolderLookup;
+import net.minecraft.world.level.block.Block;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -17,13 +19,13 @@
  */
 @Mixin(BlockPredicateArgument.class)
 public class BlockPredicateArgumentMixin {
-    @Inject(method = "parse(Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/commands/arguments/blocks/BlockPredicateArgument$Result;", at = @At("HEAD"))
-    private void getCursor(StringReader stringReader, CallbackInfoReturnable<BlockPredicateArgument.Result> cir, @Share("cursor") LocalIntRef cursorRef) {
+    @Inject(method = "parse(Lnet/minecraft/core/HolderLookup;Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/commands/arguments/blocks/BlockPredicateArgument$Result;", at = @At("HEAD"))
+    private static void getCursor(HolderLookup<Block> holderLookup, StringReader stringReader, CallbackInfoReturnable<BlockPredicateArgument.Result> cir, @Share("cursor") LocalIntRef cursorRef) {
         cursorRef.set(stringReader.getCursor());
     }
 
-    @ModifyReturnValue(method = "parse(Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/commands/arguments/blocks/BlockPredicateArgument$Result;", at = @At("RETURN"))
-    private BlockPredicateArgument.Result returnSelector(BlockPredicateArgument.Result result, @Local StringReader reader, @Share("cursor") LocalIntRef cursorRef) {
+    @ModifyReturnValue(method = "parse(Lnet/minecraft/core/HolderLookup;Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/commands/arguments/blocks/BlockPredicateArgument$Result;", at = @At("RETURN"))
+    private static BlockPredicateArgument.Result returnSelector(BlockPredicateArgument.Result result, @Local(argsOnly = true) StringReader reader, @Share("cursor") LocalIntRef cursorRef) {
         ((PackTestArgumentSource)result).packtest$setSource(reader.getRead().substring(cursorRef.get()));
         return result;
     }

src/main/java/io/github/misode/packtest/mixin/EntityArgumentMixin.java

@@ -19,12 +19,12 @@
 @Mixin(EntityArgument.class)
 public class EntityArgumentMixin {
 
-    @Inject(method = "parse(Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/commands/arguments/selector/EntitySelector;", at = @At("HEAD"))
-    private void getCursor(StringReader stringReader, CallbackInfoReturnable<EntitySelector> cir, @Share("cursor") LocalIntRef cursorRef) {
+    @Inject(method = "parse(Lcom/mojang/brigadier/StringReader;Z)Lnet/minecraft/commands/arguments/selector/EntitySelector;", at = @At("HEAD"))
+    private void getCursor(StringReader stringReader, boolean bl, CallbackInfoReturnable<EntitySelector> cir, @Share("cursor") LocalIntRef cursorRef) {
         cursorRef.set(stringReader.getCursor());
     }
 
-    @ModifyReturnValue(method = "parse(Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/commands/arguments/selector/EntitySelector;", at = @At("RETURN"))
+    @ModifyReturnValue(method = "parse(Lcom/mojang/brigadier/StringReader;Z)Lnet/minecraft/commands/arguments/selector/EntitySelector;", at = @At("RETURN"))
     private EntitySelector returnSelector(EntitySelector selector, @Local(argsOnly = true) StringReader reader, @Share("cursor") LocalIntRef cursorRef) {
         ((PackTestArgumentSource)selector).packtest$setSource(reader.getRead().substring(cursorRef.get()));
         return selector;