✨ Replace animated_java:empty with vanilla empty model in MC 1.21.4+

Author: SnaveSutit

src/systems/minecraft/itemDefinitions.d.ts

@@ -35,6 +35,9 @@ type TintSource =
 	  }
 
 type ItemModel =
+	| {
+			type: 'minecraft:empty'
+	  }
 	| {
 			type: 'minecraft:model'
 			model: string
@@ -49,7 +52,6 @@ type ItemModel =
 // 'minecraft:select': SelectModel
 // 'minecraft:range_dispatch': {}
 // 'minecraft:bundle/selected_item': {}
-// 'minecraft:empty': {}
 // 'minecraft:special': {}
 
 type ConditionModel = {

src/systems/resourcepackCompiler/1.21.4.ts

@@ -22,7 +22,6 @@ const compileResourcePack: ResourcePackCompiler = async ({
 		modelExportFolder,
 	})
 
-	const globalModelsFolder = PathModule.join('assets/animated_java/models/')
 	const itemModelDefinitionsFolder = PathModule.join(
 		'assets/animated_java/items/blueprint/',
 		aj.export_namespace
@@ -59,17 +58,6 @@ const compileResourcePack: ResourcePackCompiler = async ({
 		content: autoStringify(blockAtlas),
 	})
 
-	// Empty
-	versionedFiles.set(PathModule.join(globalModelsFolder, 'empty.json'), { content: '{}' })
-	versionedFiles.set(PathModule.join('assets/animated_java/items', 'empty.json'), {
-		content: autoStringify({
-			model: {
-				type: 'minecraft:model',
-				model: 'animated_java:empty',
-			},
-		}),
-	})
-
 	// Textures
 	for (const texture of Object.values(rig.textures)) {
 		let image: Buffer | undefined
@@ -171,10 +159,7 @@ function createMultiVariantItemDefinition(
 			cases: [
 				{
 					when: 'AJ_INTERNAL_EMPTY',
-					model: {
-						type: 'minecraft:model',
-						model: 'animated_java:empty',
-					},
+					model: { type: 'minecraft:empty' },
 				},
 			],
 			fallback: {

test-packs/1.21.5/datapacks/animated_java/pack.mcmeta

@@ -1,6 +1,10 @@
 {
 	"pack": {
 		"pack_format": 71,
-		"description": "AJ Testing DP"
+		"description": "AJ Testing DP",
+		"supported_formats": {
+			"min_inclusive": 71,
+			"max_inclusive": 79
+		}
 	}
 }

test-packs/1.21.5/resources/pack.mcmeta

@@ -1,6 +1,10 @@
 {
 	"pack": {
 		"pack_format": 55,
-		"description": "AJ Testing RP"
+		"description": "AJ Testing RP",
+		"supported_formats": {
+			"min_inclusive": 55,
+			"max_inclusive": 62
+		}
 	}
 }