🔀 Merge 🩹 Field tints is in the wrong location (#387)

Author: SnaveSutit

src/systems/minecraft/itemDefinitions.ts

@@ -34,20 +34,18 @@ type TintSource =
 			default: [number, number, number]
 	  }
 
-type ItemModel = {
-	tints?: TintSource[]
-} & (
+type ItemModel =
 	| {
 			type: 'minecraft:model'
 			model: string
+			tints?: TintSource[]
 	  }
 	| {
 			type: 'minecraft:composite'
 			models: ItemModel[]
 	  }
 	| ConditionModel
 	| SelectModel
-)
 // 'minecraft:select': SelectModel
 // 'minecraft:range_dispatch': {}
 // 'minecraft:bundle/selected_item': {}

src/systems/resourcepackCompiler/1.21.4.ts

@@ -1,7 +1,6 @@
 import { MAX_PROGRESS, PROGRESS, PROGRESS_DESCRIPTION } from '../../interface/dialog/exportProgress'
 import { isResourcePackPath, toSafeFuntionName } from '../../util/minecraftUtil'
 import { Variant } from '../../variants'
-import { IntentionalExportError } from '../exporter'
 import { IItemDefinition } from '../minecraft/itemDefinitions'
 import { type ITextureAtlas } from '../minecraft/textureAtlas'
 import { IRenderedNodes, IRenderedRig, IRenderedVariantModel } from '../rigRenderer'
@@ -219,12 +218,7 @@ function createSingleVariantItemDefinition(model: IRenderedVariantModel): IItemD
 		model: {
 			type: 'minecraft:model',
 			model: model.resource_location,
-			tints: [
-				{
-					type: 'minecraft:dye',
-					default: [1, 1, 1],
-				},
-			],
+			tints: [new oneLiner({ type: 'minecraft:dye', default: [1, 1, 1] })],
 		},
 	}
 }
@@ -244,13 +238,8 @@ function createMultiVariantItemDefinition(
 			fallback: {
 				type: 'minecraft:model',
 				model: model.resource_location,
+				tints: [new oneLiner({ type: 'minecraft:dye', default: [1, 1, 1] })],
 			},
-			tints: [
-				{
-					type: 'minecraft:dye',
-					default: [1, 1, 1],
-				},
-			],
 		},
 	}
 
@@ -262,6 +251,7 @@ function createMultiVariantItemDefinition(
 			model: {
 				type: 'minecraft:model',
 				model: variantModel.resource_location,
+				tints: [new oneLiner({ type: 'minecraft:dye', default: [1, 1, 1] })],
 			},
 		} as (typeof itemDefinition.model.cases)[0])
 	}

test_blueprints/armor_stand.ajblueprint

@@ -18,9 +18,9 @@
 		"display_item": "minecraft:white_dye",
 		"custom_model_data_offset": 0,
 		"enable_advanced_resource_pack_settings": false,
-		"resource_pack": "C:\\Users\\SnaveSutit\\AppData\\Roaming\\.modrinth\\profiles\\Animated Java Dev\\resourcepacks\\resourcepack",
+		"resource_pack": "C:\\Users\\SnaveSutit\\AppData\\Roaming\\ModrinthApp\\profiles\\Animated Java Dev\\resourcepacks\\resourcepack",
 		"enable_advanced_data_pack_settings": false,
-		"data_pack": "C:\\Users\\SnaveSutit\\AppData\\Roaming\\.modrinth\\profiles\\Animated Java Dev\\saves\\Animated Java Dev\\datapacks\\datapack",
+		"data_pack": "C:\\Users\\SnaveSutit\\AppData\\Roaming\\ModrinthApp\\profiles\\Animated Java Dev\\saves\\Animated Java Dev\\datapacks\\datapack",
 		"summon_commands": "",
 		"ticking_commands": "",
 		"interpolation_duration": 1,
@@ -882,7 +882,7 @@
 			"config": {},
 			"item": "minecraft:diamond",
 			"item_display": "none",
-			"text": "{\n\t\"text\": \"Hello, World!\",\n\t\"color\": \"green\",\n\t\"shadow_color\":\"red\"\n}\n",
+			"text": "{\n\t\"text\": \"Hello, World!\",\n\t\"color\": \"green\"\n}\n",
 			"lineWidth": 200,
 			"backgroundColor": "#ffffff",
 			"backgroundAlpha": 0.25098,
@@ -1515,10 +1515,10 @@
 		},
 		{
 			"path": "",
-			"name": "transparent",
+			"name": "transparent.png",
 			"folder": "",
 			"namespace": "",
-			"id": "0",
+			"id": "3",
 			"group": "",
 			"width": 16,
 			"height": 16,
@@ -3154,7 +3154,7 @@
 			"override": false,
 			"length": 0.8,
 			"snapping": 20,
-			"selected": false,
+			"selected": true,
 			"saved": false,
 			"path": "",
 			"anim_time_update": "",