🐛 Fix #381 - Outdated item count format in exported functions

SnaveSutit · SnaveSutit · commit d6cd930a1bbb · 2025-02-26T19:29:42.000-05:00
diff --git a/src/systems/datapackCompiler/index.ts b/src/systems/datapackCompiler/index.ts
@@ -637,10 +637,7 @@ async function generateRootEntityPassengers(rig: IRenderedRig, rigHash: string)
 				if (!variantModel) {
 					throw new Error(`Model for bone '${node.path_name}' not found!`)
 				}
-				passenger.set(
-					'item',
-					item.set('id', new NbtString(aj.display_item)).set('Count', new NbtInt(1))
-				)
+				passenger.set('item', item.set('id', new NbtString(aj.display_item)))
 				switch (aj.target_minecraft_version) {
 					case '1.20.4': {
 						item.set(
@@ -650,6 +647,8 @@ async function generateRootEntityPassengers(rig: IRenderedRig, rigHash: string)
 								new NbtInt(variantModel.custom_model_data)
 							)
 						)
+						// Count defaults to 1, but only in versions above 1.20.4
+						item.set('Count', new NbtInt(1))
 						break
 					}
 					case '1.20.5':

Original file line number	Diff line number	Diff line change
`@@ -637,10 +637,7 @@ async function generateRootEntityPassengers(rig: IRenderedRig, rigHash: string)`
`637`	`637`	`if (!variantModel) {`
`638`	`638`	throw new Error(`Model for bone '${node.path_name}' not found!`)
`639`	`639`	`}`
`640`		`- passenger.set(`
`641`		`- 'item',`
`642`		`- item.set('id', new NbtString(aj.display_item)).set('Count', new NbtInt(1))`
`643`		`- )`
	`640`	`+ passenger.set('item', item.set('id', new NbtString(aj.display_item)))`
`644`	`641`	`switch (aj.target_minecraft_version) {`
`645`	`642`	`case '1.20.4': {`
`646`	`643`	`item.set(`
`@@ -650,6 +647,8 @@ async function generateRootEntityPassengers(rig: IRenderedRig, rigHash: string)`
`650`	`647`	`new NbtInt(variantModel.custom_model_data)`
`651`	`648`	`)`
`652`	`649`	`)`
	`650`	`+ // Count defaults to 1, but only in versions above 1.20.4`
	`651`	`+ item.set('Count', new NbtInt(1))`
`653`	`652`	`break`
`654`	`653`	`}`
`655`	`654`	`case '1.20.5':`