[1.18.x] Add 3 new ingredient types, and make existing ingredients compatible with datagen (#8517)

This commit is contained in:
KnightMiner authored and GitHub committed 2022-03-24 22:04:32 +00:00
1 parent c3bd365baa
commit 093acab825
24 files changed
+1130 -38

No files matched your search

+14
View File
@@ -90,9 +90,23 @@ ba49dc1068fd9c93a458f4267896ea4476187411 assets/tag_based_tool_types/models/item
15c4780e8ea8e13179a35f045ac7975c76f4471d assets/tag_based_tool_types/models/item/test_tool.json
806659ba3e9c12797df0fe7211a222795834fdfd data/data_gen_test/advancements/conditional.json
0001aa55877ddee50e3180db7337e926797d7e4d data/data_gen_test/advancements/obtain_dirt.json
9142f390548b2aba862f29e05ac44452b6083d31 data/data_gen_test/advancements/recipes/building_blocks/compound_ingredient_custom_types.json
ed9a05f407f40fcf73bf16a488540f33e69d79df data/data_gen_test/advancements/recipes/building_blocks/compound_ingredient_only_vanilla.json
a9b940a9341ba1e6836f6cccde57fd84ac6cefde data/data_gen_test/advancements/recipes/building_blocks/intersection_ingredient.json
76e760c8e8a1bbd3fb5538bc2d773c117016c0ce data/data_gen_test/advancements/recipes/conditional2.json
eb5a3c9b0eece693b02c1d13095e395b702a0f9d data/data_gen_test/advancements/recipes/tools/contains_nbt_ingredient_item_set.json
5b8b202b81157845e9065a0a92cfd777d0f6dc97 data/data_gen_test/advancements/recipes/tools/contains_nbt_ingredient_single_item.json
139a68aa4991369581091633c15ead8c212a70ce data/data_gen_test/advancements/recipes/tools/difference_ingredient.json
b9f392d257ce4622bd7daa98d601f461b78934c9 data/data_gen_test/advancements/recipes/tools/exact_nbt_ingredient.json
094ed894c5a3d86df27b40cca803ae842f783db6 data/data_gen_test/recipes/compound_ingredient_custom_types.json
4b6e057c4ca229e22f57c2fb929173b6ed7dc187 data/data_gen_test/recipes/compound_ingredient_only_vanilla.json
ed4cbf1a3a2f5d8969f6346fdc9acdbe81d0c919 data/data_gen_test/recipes/conditional.json
ca9827bff0a49957e01cf3887ef5131ad8710320 data/data_gen_test/recipes/conditional2.json
82ef22fdcd68a56bfd89fcd65a7d3472761c2b67 data/data_gen_test/recipes/contains_nbt_ingredient_item_set.json
9befa598e96e2ed26ce13290164373e4a37808a7 data/data_gen_test/recipes/contains_nbt_ingredient_single_item.json
d39a07652a4e5b7d38e94a00ceb3ae54298ed169 data/data_gen_test/recipes/difference_ingredient.json
1af57f3033a3ac89842f210d55ac39a7b3e43c5b data/data_gen_test/recipes/exact_nbt_ingredient.json
d769b2a8ef432cd2de02b81ceac7f747aa1f7e8d data/data_gen_test/recipes/intersection_ingredient.json
8831e79c8d15b1bc00eb29d354bb22b64d9ddcdd data/data_gen_test/tags/blocks/test.json
d65c425e740dc833f29d16606a1171825876be0d data/data_gen_test/tags/blocks/thing/one.json
1f70ed4ddc878bada5e43d3c44a34157806beda8 data/data_gen_test/tags/blocks/thing/three.json
@@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"data_gen_test:compound_ingredient_custom_types"
]
},
"criteria": {
"has_planks": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"items": [
"minecraft:crimson_planks"
]
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "data_gen_test:compound_ingredient_custom_types"
}
}
},
"requirements": [
[
"has_planks",
"has_the_recipe"
]
]
}
@@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"data_gen_test:compound_ingredient_only_vanilla"
]
},
"criteria": {
"has_planks": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"items": [
"minecraft:crimson_planks"
]
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "data_gen_test:compound_ingredient_only_vanilla"
}
}
},
"requirements": [
[
"has_planks",
"has_the_recipe"
]
]
}
@@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"data_gen_test:intersection_ingredient"
]
},
"criteria": {
"has_planks": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"items": [
"minecraft:crimson_planks"
]
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "data_gen_test:intersection_ingredient"
}
}
},
"requirements": [
[
"has_planks",
"has_the_recipe"
]
]
}
@@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"data_gen_test:contains_nbt_ingredient_item_set"
]
},
"criteria": {
"has_pickaxe": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"items": [
"minecraft:wooden_pickaxe"
]
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "data_gen_test:contains_nbt_ingredient_item_set"
}
}
},
"requirements": [
[
"has_pickaxe",
"has_the_recipe"
]
]
}
@@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"data_gen_test:contains_nbt_ingredient_single_item"
]
},
"criteria": {
"has_pickaxe": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"items": [
"minecraft:stone_pickaxe"
]
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "data_gen_test:contains_nbt_ingredient_single_item"
}
}
},
"requirements": [
[
"has_pickaxe",
"has_the_recipe"
]
]
}
@@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"data_gen_test:difference_ingredient"
]
},
"criteria": {
"has_fence": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"items": [
"minecraft:crimson_fence"
]
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "data_gen_test:difference_ingredient"
}
}
},
"requirements": [
[
"has_fence",
"has_the_recipe"
]
]
}
@@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"data_gen_test:exact_nbt_ingredient"
]
},
"criteria": {
"has_pickaxe": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"items": [
"minecraft:iron_pickaxe"
]
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "data_gen_test:exact_nbt_ingredient"
}
}
},
"requirements": [
[
"has_pickaxe",
"has_the_recipe"
]
]
}
@@ -0,0 +1,28 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"#",
"#"
],
"key": {
"#": [
{
"type": "forge:nbt",
"item": "minecraft:iron_pickaxe",
"count": 1,
"nbt": "{Damage:3}"
},
[
{
"tag": "minecraft:planks"
},
{
"tag": "minecraft:logs"
}
]
]
},
"result": {
"item": "minecraft:gold_block"
}
}
@@ -0,0 +1,23 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"###",
" # "
],
"key": {
"#": [
{
"tag": "minecraft:planks"
},
{
"tag": "minecraft:logs"
},
{
"item": "minecraft:bedrock"
}
]
},
"result": {
"item": "minecraft:dirt"
}
}
@@ -0,0 +1,17 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"type": "forge:partial_nbt",
"items": [
"minecraft:iron_pickaxe",
"minecraft:stone_pickaxe",
"minecraft:wooden_pickaxe"
],
"nbt": "{display:{Name:\u0027{\"text\":\"Diamond Pickaxe\"}\u0027}}"
}
],
"result": {
"item": "minecraft:diamond_pickaxe"
}
}
@@ -0,0 +1,13 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"type": "forge:partial_nbt",
"item": "minecraft:stone_pickaxe",
"nbt": "{Damage:3}"
}
],
"result": {
"item": "minecraft:iron_pickaxe"
}
}
@@ -0,0 +1,22 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" # ",
"###",
" # "
],
"key": {
"#": {
"type": "forge:difference",
"base": {
"tag": "minecraft:fences"
},
"subtracted": {
"tag": "minecraft:non_flammable_wood"
}
}
},
"result": {
"item": "minecraft:flint_and_steel"
}
}
@@ -0,0 +1,14 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"type": "forge:nbt",
"item": "minecraft:iron_pickaxe",
"count": 1,
"nbt": "{Damage:3}"
}
],
"result": {
"item": "minecraft:golden_pickaxe"
}
}
@@ -0,0 +1,24 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"###",
"###",
" # "
],
"key": {
"#": {
"type": "forge:intersection",
"children": [
{
"tag": "minecraft:planks"
},
{
"tag": "minecraft:non_flammable_wood"
}
]
}
},
"result": {
"item": "minecraft:netherrack"
}
}