refactor: Update to new Vintage's optional smart values

bbfh-dev · bbfh-dev · commit 0ce48168a3f0 · 2026-02-25T20:41:19.000+03:00
diff --git a/templates/custom_items/data/bubblellaneous/loot_table/item/%[id].json b/templates/custom_items/data/bubblellaneous/loot_table/item/%[id].json
@@ -27,8 +27,9 @@
 									"translate": "item.bubblellaneous.%[id]"
 								},
 								"%[consumable_prefix]minecraft:consumable": "%[consumable_value]",
-								"%[food_prefix]minecraft:food": "%[food_value]",
-								"minecraft:max_stack_size": "%[max_stack_size]"
+								"minecraft:food": "%[food?]",
+								"minecraft:max_stack_size": "%[max_stack_size]",
+								"minecraft:equippable": "%[equippable?]"
 							}
 						}
 					]
diff --git a/templates/custom_items/definitions/%[card_suit]_%[card_rank]_playing_card.json b/templates/custom_items/definitions/%[card_suit]_%[card_rank]_playing_card.json
@@ -16,7 +16,5 @@
 	],
 	"consumable_prefix": "!",
 	"consumable_value": {},
-	"food_prefix": "!",
-	"food_value": {},
 	"max_stack_size": 64
 }
diff --git a/templates/custom_items/definitions/%[color]_beer_bottle.json b/templates/custom_items/definitions/%[color]_beer_bottle.json
@@ -39,8 +39,7 @@
 			}
 		]
 	},
-	"food_prefix": "",
-	"food_value": {
+	"food": {
 		"nutrition": 4,
 		"saturation": 5,
 		"can_always_eat": true
diff --git a/templates/custom_items/definitions/%[color]_key.json b/templates/custom_items/definitions/%[color]_key.json
@@ -21,7 +21,5 @@
 	],
 	"consumable_prefix": "",
 	"consumable_value": {},
-	"food_prefix": "!",
-	"food_value": {},
 	"max_stack_size": 16
 }
diff --git a/templates/custom_items/definitions/broccoli.json b/templates/custom_items/definitions/broccoli.json
@@ -20,8 +20,7 @@
 		"consume_seconds": 1.0,
 		"has_consume_particles": true
 	},
-	"food_prefix": "",
-	"food_value": {
+	"food": {
 		"nutrition": 3,
 		"saturation": 3,
 		"can_always_eat": false
diff --git a/templates/custom_items/definitions/burger.json b/templates/custom_items/definitions/burger.json
@@ -25,8 +25,7 @@
 		"consume_seconds": 5.0,
 		"has_consume_particles": true
 	},
-	"food_prefix": "",
-	"food_value": {
+	"food": {
 		"nutrition": 8,
 		"saturation": 6,
 		"can_always_eat": false
diff --git a/templates/custom_items/definitions/cereal.json b/templates/custom_items/definitions/cereal.json
@@ -25,8 +25,7 @@
 		"consume_seconds": 6.0,
 		"has_consume_particles": false
 	},
-	"food_prefix": "",
-	"food_value": {
+	"food": {
 		"nutrition": 10,
 		"saturation": 14,
 		"can_always_eat": false
diff --git a/templates/custom_items/definitions/cheese.json b/templates/custom_items/definitions/cheese.json
@@ -20,8 +20,7 @@
 		"consume_seconds": 2.0,
 		"has_consume_particles": true
 	},
-	"food_prefix": "",
-	"food_value": {
+	"food": {
 		"nutrition": 2,
 		"saturation": 1,
 		"can_always_eat": false
diff --git a/templates/custom_items/definitions/chocolate_bar.json b/templates/custom_items/definitions/chocolate_bar.json
@@ -20,8 +20,7 @@
 		"consume_seconds": 1.6,
 		"has_consume_particles": true
 	},
-	"food_prefix": "",
-	"food_value": {
+	"food": {
 		"nutrition": 3,
 		"saturation": 0,
 		"can_always_eat": false
diff --git a/templates/custom_items/definitions/coffee_cup.json b/templates/custom_items/definitions/coffee_cup.json
@@ -21,8 +21,7 @@
 		"has_consume_particles": false,
 		"sound": "minecraft:entity.generic.drink"
 	},
-	"food_prefix": "",
-	"food_value": {
+	"food": {
 		"nutrition": 3,
 		"saturation": 10,
 		"can_always_eat": true
diff --git a/templates/custom_items/definitions/crowbar.json b/templates/custom_items/definitions/crowbar.json
@@ -16,8 +16,6 @@
 	],
 	"consumable_prefix": "!",
 	"consumable_value": {},
-	"food_prefix": "!",
-	"food_value": {},
 	"max_stack_size": 1,
 	"i": 0
 }
diff --git a/templates/custom_items/definitions/cucumber.json b/templates/custom_items/definitions/cucumber.json
@@ -20,8 +20,7 @@
 		"consume_seconds": 1.0,
 		"has_consume_particles": true
 	},
-	"food_prefix": "",
-	"food_value": {
+	"food": {
 		"nutrition": 2,
 		"saturation": 1,
 		"can_always_eat": false
diff --git a/templates/custom_items/definitions/donut.json b/templates/custom_items/definitions/donut.json
@@ -25,8 +25,7 @@
 		"consume_seconds": 4.0,
 		"has_consume_particles": true
 	},
-	"food_prefix": "",
-	"food_value": {
+	"food": {
 		"nutrition": 8,
 		"saturation": 2,
 		"can_always_eat": false
diff --git a/templates/custom_items/definitions/grapes.json b/templates/custom_items/definitions/grapes.json
@@ -20,8 +20,7 @@
 		"consume_seconds": 1.0,
 		"has_consume_particles": true
 	},
-	"food_prefix": "",
-	"food_value": {
+	"food": {
 		"nutrition": 1,
 		"saturation": 1,
 		"can_always_eat": false
diff --git a/templates/custom_items/definitions/megaphone.json b/templates/custom_items/definitions/megaphone.json
@@ -16,8 +16,6 @@
 	],
 	"consumable_prefix": "!",
 	"consumable_value": {},
-	"food_prefix": "!",
-	"food_value": {},
 	"max_stack_size": 16,
 	"i": 0
 }
diff --git a/templates/custom_items/definitions/nanoglasses.json b/templates/custom_items/definitions/nanoglasses.json
@@ -21,8 +21,10 @@
 	],
 	"consumable_prefix": "!",
 	"consumable_value": {},
-	"food_prefix": "!",
-	"food_value": {},
+	"equippable": {
+		"slot": "head",
+		"equip_sound": "minecraft:item.armor.equip_iron"
+	},
 	"max_stack_size": 1,
 	"i": 0
 }
diff --git a/templates/custom_items/definitions/omelette.json b/templates/custom_items/definitions/omelette.json
@@ -20,8 +20,7 @@
 		"consume_seconds": 1.6,
 		"has_consume_particles": true
 	},
-	"food_prefix": "",
-	"food_value": {
+	"food": {
 		"nutrition": 2,
 		"saturation": 4,
 		"can_always_eat": false
diff --git a/templates/custom_items/definitions/padlock.json b/templates/custom_items/definitions/padlock.json
@@ -16,8 +16,6 @@
 	],
 	"consumable_prefix": "!",
 	"consumable_value": {},
-	"food_prefix": "!",
-	"food_value": {},
 	"max_stack_size": 1,
 	"i": 0
 }
diff --git a/templates/custom_items/definitions/strawberry.json b/templates/custom_items/definitions/strawberry.json
@@ -20,8 +20,7 @@
 		"consume_seconds": 0.5,
 		"has_consume_particles": true
 	},
-	"food_prefix": "",
-	"food_value": {
+	"food": {
 		"nutrition": 1,
 		"saturation": 1,
 		"can_always_eat": false
diff --git a/templates/custom_items/definitions/toast.json b/templates/custom_items/definitions/toast.json
@@ -20,8 +20,7 @@
 		"consume_seconds": 2.0,
 		"has_consume_particles": true
 	},
-	"food_prefix": "",
-	"food_value": {
+	"food": {
 		"nutrition": 2,
 		"saturation": 5,
 		"can_always_eat": false
diff --git a/templates/custom_items/definitions/tomato.json b/templates/custom_items/definitions/tomato.json
@@ -20,8 +20,7 @@
 		"consume_seconds": 1.0,
 		"has_consume_particles": true
 	},
-	"food_prefix": "",
-	"food_value": {
+	"food": {
 		"nutrition": 1,
 		"saturation": 1,
 		"can_always_eat": false
diff --git a/templates/custom_items/definitions/umbrella.json b/templates/custom_items/definitions/umbrella.json
@@ -16,8 +16,6 @@
 	],
 	"consumable_prefix": "!",
 	"consumable_value": {},
-	"food_prefix": "!",
-	"food_value": {},
 	"max_stack_size": 1,
 	"i": 0
 }

Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,9 @@`
`27`	`27`	`"translate": "item.bubblellaneous.%[id]"`
`28`	`28`	`},`
`29`	`29`	`"%[consumable_prefix]minecraft:consumable": "%[consumable_value]",`
`30`		`- "%[food_prefix]minecraft:food": "%[food_value]",`
`31`		`- "minecraft:max_stack_size": "%[max_stack_size]"`
	`30`	`+ "minecraft:food": "%[food?]",`
	`31`	`+ "minecraft:max_stack_size": "%[max_stack_size]",`
	`32`	`+ "minecraft:equippable": "%[equippable?]"`
`32`	`33`	`}`
`33`	`34`	`}`
`34`	`35`	`]`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,5 @@`
`16`	`16`	`],`
`17`	`17`	`"consumable_prefix": "!",`
`18`	`18`	`"consumable_value": {},`
`19`		`- "food_prefix": "!",`
`20`		`- "food_value": {},`
`21`	`19`	`"max_stack_size": 64`
`22`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,7 @@`
`39`	`39`	`}`
`40`	`40`	`]`
`41`	`41`	`},`
`42`		`- "food_prefix": "",`
`43`		`- "food_value": {`
	`42`	`+ "food": {`
`44`	`43`	`"nutrition": 4,`
`45`	`44`	`"saturation": 5,`
`46`	`45`	`"can_always_eat": true`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,5 @@`
`21`	`21`	`],`
`22`	`22`	`"consumable_prefix": "",`
`23`	`23`	`"consumable_value": {},`
`24`		`- "food_prefix": "!",`
`25`		`- "food_value": {},`
`26`	`24`	`"max_stack_size": 16`
`27`	`25`	`}`