From 7e9c0a89c3c2a76837e6e56beb493e9265afd600 Mon Sep 17 00:00:00 2001 From: PiTheGuy Date: Wed, 7 Aug 2024 16:17:38 -0500 Subject: [PATCH] Update to 1.21.1-rc1 --- build.gradle | 4 ++-- .../net/minecraft/commands/arguments/EntityArgument.mapping | 6 ++++++ .../commands/arguments/GameProfileArgument.mapping | 6 ++++++ .../commands/arguments/ScoreHolderArgument.mapping | 6 ++++++ .../arguments/selector/EntitySelectorParser.mapping | 2 ++ 5 files changed, 22 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 6c1b5e65a..b3cd83c82 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ writtenbooks { } compass { - version = '1.21' + version = '1.21.1-rc1' } repositories { @@ -69,7 +69,7 @@ dependencies { remapper 'net.minecraftforge:ForgeAutoRenamingTool:1.0.2' // Enigma, gorgeous interface for editing mappings - enigma 'org.quiltmc:enigma-swing:2.4.0' + enigma 'org.quiltmc:enigma-swing:2.4.2' // ParchmentJAM, JAMMER integration for migrating mapping data jammer 'org.parchmentmc.jam:jam-parchment:0.1.0' diff --git a/data/net/minecraft/commands/arguments/EntityArgument.mapping b/data/net/minecraft/commands/arguments/EntityArgument.mapping index 23d75252b..d28a1e27c 100644 --- a/data/net/minecraft/commands/arguments/EntityArgument.mapping +++ b/data/net/minecraft/commands/arguments/EntityArgument.mapping @@ -27,6 +27,12 @@ CLASS net/minecraft/commands/arguments/EntityArgument ARG 2 builder METHOD parse (Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/commands/arguments/selector/EntitySelector; ARG 1 reader + METHOD parse (Lcom/mojang/brigadier/StringReader;Ljava/lang/Object;)Ljava/lang/Object; + ARG 1 reader + ARG 2 suggestionProvider + METHOD parse (Lcom/mojang/brigadier/StringReader;Z)Lnet/minecraft/commands/arguments/selector/EntitySelector; + ARG 1 reader + ARG 2 allowSelectors CLASS Info CLASS Template METHOD (Lnet/minecraft/commands/arguments/EntityArgument$Info;ZZ)V diff --git a/data/net/minecraft/commands/arguments/GameProfileArgument.mapping b/data/net/minecraft/commands/arguments/GameProfileArgument.mapping index 4e8022e30..bdfebffc7 100644 --- a/data/net/minecraft/commands/arguments/GameProfileArgument.mapping +++ b/data/net/minecraft/commands/arguments/GameProfileArgument.mapping @@ -11,6 +11,12 @@ CLASS net/minecraft/commands/arguments/GameProfileArgument ARG 2 builder METHOD parse (Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/commands/arguments/GameProfileArgument$Result; ARG 1 reader + METHOD parse (Lcom/mojang/brigadier/StringReader;Ljava/lang/Object;)Ljava/lang/Object; + ARG 1 reader + ARG 2 suggestionProvider + METHOD parse (Lcom/mojang/brigadier/StringReader;Z)Lnet/minecraft/commands/arguments/GameProfileArgument$Result; + ARG 0 reader + ARG 1 allowSelectors CLASS Result METHOD getNames (Lnet/minecraft/commands/CommandSourceStack;)Ljava/util/Collection; ARG 1 source diff --git a/data/net/minecraft/commands/arguments/ScoreHolderArgument.mapping b/data/net/minecraft/commands/arguments/ScoreHolderArgument.mapping index dd42c7415..40afde84e 100644 --- a/data/net/minecraft/commands/arguments/ScoreHolderArgument.mapping +++ b/data/net/minecraft/commands/arguments/ScoreHolderArgument.mapping @@ -27,6 +27,12 @@ CLASS net/minecraft/commands/arguments/ScoreHolderArgument ARG 1 builder METHOD parse (Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/commands/arguments/ScoreHolderArgument$Result; ARG 1 reader + METHOD parse (Lcom/mojang/brigadier/StringReader;Ljava/lang/Object;)Ljava/lang/Object; + ARG 1 reader + ARG 2 suggestionProvider + METHOD parse (Lcom/mojang/brigadier/StringReader;Z)Lnet/minecraft/commands/arguments/ScoreHolderArgument$Result; + ARG 1 reader + ARG 2 allowSelectors CLASS Info CLASS Template METHOD (Lnet/minecraft/commands/arguments/ScoreHolderArgument$Info;Z)V diff --git a/data/net/minecraft/commands/arguments/selector/EntitySelectorParser.mapping b/data/net/minecraft/commands/arguments/selector/EntitySelectorParser.mapping index a8a207e65..bd0485613 100644 --- a/data/net/minecraft/commands/arguments/selector/EntitySelectorParser.mapping +++ b/data/net/minecraft/commands/arguments/selector/EntitySelectorParser.mapping @@ -6,6 +6,8 @@ CLASS net/minecraft/commands/arguments/selector/EntitySelectorParser ARG 2 allowSelectors METHOD addPredicate (Ljava/util/function/Predicate;)V ARG 1 predicate + METHOD allowSelectors (Ljava/lang/Object;)Z + ARG 0 suggestionProvider METHOD createAabb (DDD)Lnet/minecraft/world/phys/AABB; ARG 1 sizeX ARG 3 sizeY