diff --git a/mappings/net/minecraft/command/argument/ArgumentTypes.mapping b/mappings/net/minecraft/command/argument/ArgumentTypes.mapping
index 67706803ea..e7741f227a 100644
--- a/mappings/net/minecraft/command/argument/ArgumentTypes.mapping
+++ b/mappings/net/minecraft/command/argument/ArgumentTypes.mapping
@@ -12,6 +12,7 @@ CLASS net/minecraft/class_2316 net/minecraft/command/argument/ArgumentTypes
 		ARG 0 id
 			COMMENT the id of the argument type
 	METHOD method_10018 byId (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2316$class_2317;
+		ARG 0 id
 	METHOD method_10019 toPacket (Lnet/minecraft/class_2540;Lcom/mojang/brigadier/arguments/ArgumentType;)V
 	METHOD method_10020 toJson (Lcom/google/gson/JsonObject;Lcom/mojang/brigadier/arguments/ArgumentType;)V
 	METHOD method_30923 hasClass (Lcom/mojang/brigadier/arguments/ArgumentType;)Z
diff --git a/mappings/net/minecraft/command/argument/IdentifierArgumentType.mapping b/mappings/net/minecraft/command/argument/IdentifierArgumentType.mapping
index acbd8e3d60..fec7dc14d5 100644
--- a/mappings/net/minecraft/command/argument/IdentifierArgumentType.mapping
+++ b/mappings/net/minecraft/command/argument/IdentifierArgumentType.mapping
@@ -1,10 +1,26 @@
 CLASS net/minecraft/class_2232 net/minecraft/command/argument/IdentifierArgumentType
+	FIELD field_21506 UNKNOWN_PREDICATE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
+	FIELD field_24267 UNKNOWN_ATTRIBUTE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
+	FIELD field_28002 UNKNOWN_ITEM_MODIFIER_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
 	FIELD field_9945 UNKNOWN_ADVANCEMENT_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
 	FIELD field_9946 EXAMPLES Ljava/util/Collection;
 	FIELD field_9947 UNKNOWN_RECIPE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
+	METHOD method_23727 getPredicateArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_5341;
+		ARG 0 context
+		ARG 1 argumentName
+	METHOD method_27575 getAttributeArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_1320;
+		ARG 0 context
+		ARG 1 argumentName
+	METHOD method_32688 getItemModifierArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_117;
+		ARG 0 context
+		ARG 1 argumentName
 	METHOD method_9439 getAdvancementArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_161;
+		ARG 0 context
+		ARG 1 argumentName
 	METHOD method_9441 identifier ()Lnet/minecraft/class_2232;
 	METHOD method_9442 getRecipeArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_1860;
+		ARG 0 context
+		ARG 1 argumentName
 	METHOD method_9443 getIdentifier (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2960;
 		ARG 0 context
 		ARG 1 name
diff --git a/mappings/net/minecraft/server/command/ItemCommand.mapping b/mappings/net/minecraft/server/command/ItemCommand.mapping
new file mode 100644
index 0000000000..cb5acddd6e
--- /dev/null
+++ b/mappings/net/minecraft/server/command/ItemCommand.mapping
@@ -0,0 +1,82 @@
+CLASS net/minecraft/class_5687 net/minecraft/server/command/ItemCommand
+	FIELD field_28018 NOT_A_CONTAINER_TARGET_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic3CommandExceptionType;
+	FIELD field_28019 NO_SUCH_SLOT_TARGET_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
+	FIELD field_28020 NOT_A_CONTAINER_SOURCE_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic3CommandExceptionType;
+	FIELD field_28021 NO_SUCH_SLOT_SOURCE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
+	FIELD field_28022 NO_CHANGES_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
+	FIELD field_28023 KNOWN_ITEM_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType;
+	FIELD field_28024 MODIFIER_SUGGESTION_PROVIDER Lcom/mojang/brigadier/suggestion/SuggestionProvider;
+	METHOD method_32707 register (Lcom/mojang/brigadier/CommandDispatcher;)V
+		ARG 0 dispatcher
+	METHOD method_32711 executeBlockCopyEntity (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;ILnet/minecraft/class_2338;I)I
+		ARG 0 source
+		ARG 1 sourceEntity
+		ARG 2 sourceSlot
+		ARG 3 pos
+		ARG 4 slot
+	METHOD method_32712 executeBlockCopyEntity (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;ILnet/minecraft/class_2338;ILnet/minecraft/class_117;)I
+		ARG 0 source
+		ARG 1 sourceEntity
+		ARG 2 sourceSlot
+		ARG 3 pos
+		ARG 4 slot
+		ARG 5 modifier
+	METHOD method_32713 executeEntityCopyEntity (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;ILjava/util/Collection;I)I
+		ARG 0 source
+		ARG 1 sourceEntity
+		ARG 2 sourceSlot
+		ARG 3 targets
+		ARG 4 slot
+	METHOD method_32714 executeEntityCopyEntity (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;ILjava/util/Collection;ILnet/minecraft/class_117;)I
+		ARG 0 source
+		ARG 1 sourceEntity
+		ARG 2 sourceSlot
+		ARG 3 targets
+		ARG 4 slot
+		ARG 5 modifier
+	METHOD method_32717 executeBlockReplace (Lnet/minecraft/class_2168;Lnet/minecraft/class_2338;ILnet/minecraft/class_1799;)I
+		ARG 0 source
+		ARG 1 pos
+		ARG 2 slot
+		ARG 3 stack
+	METHOD method_32718 executeBlockModify (Lnet/minecraft/class_2168;Lnet/minecraft/class_2338;ILnet/minecraft/class_117;)I
+		ARG 0 source
+		ARG 1 pos
+		ARG 2 slot
+		ARG 3 modifier
+	METHOD method_32719 executeBlockCopyBlock (Lnet/minecraft/class_2168;Lnet/minecraft/class_2338;ILnet/minecraft/class_2338;I)I
+		ARG 0 source
+		ARG 1 sourcePos
+		ARG 2 sourceSlot
+		ARG 3 pos
+		ARG 4 slot
+	METHOD method_32720 executeBlockCopyBlock (Lnet/minecraft/class_2168;Lnet/minecraft/class_2338;ILnet/minecraft/class_2338;ILnet/minecraft/class_117;)I
+		ARG 0 source
+		ARG 1 sourcePos
+		ARG 2 sourceSlot
+		ARG 3 pos
+		ARG 4 slot
+		ARG 5 modifier
+	METHOD method_32721 executeEntityCopyBlock (Lnet/minecraft/class_2168;Lnet/minecraft/class_2338;ILjava/util/Collection;I)I
+		ARG 0 source
+		ARG 1 sourcePos
+		ARG 2 sourceSlot
+		ARG 3 targets
+		ARG 4 slot
+	METHOD method_32722 executeEntityCopyBlock (Lnet/minecraft/class_2168;Lnet/minecraft/class_2338;ILjava/util/Collection;ILnet/minecraft/class_117;)I
+		ARG 0 source
+		ARG 1 sourcePos
+		ARG 2 sourceSlot
+		ARG 3 targets
+		ARG 4 slot
+		ARG 5 modifier
+	METHOD method_32724 executeEntityReplace (Lnet/minecraft/class_2168;Ljava/util/Collection;ILnet/minecraft/class_1799;)I
+		ARG 0 source
+		ARG 1 targets
+		ARG 2 slot
+		ARG 3 stack
+	METHOD method_32725 executeEntityModify (Lnet/minecraft/class_2168;Ljava/util/Collection;ILnet/minecraft/class_117;)I
+		ARG 0 source
+		ARG 1 targets
+		ARG 2 slot
+		ARG 3 modifier