Skip to content

Commit

Permalink
Update to loadables for fluid ingredient and entity ingredient
Browse files Browse the repository at this point in the history 
For simplicity, fluid ingredent ditched the single value method since set covers everything single value does.
Fluid ingredients had a loadable before, but the new one is a lot simplier and notably enforces the fluid is present always. Can use defaulting fields if we ever need to default to empty
  • Loading branch information
@KnightMiner
KnightMiner committed Mar 26, 2024
1 parent 0551316 commit 10bb3f9
Show file tree
Hide file tree
Showing 47 changed files with 131 additions and 50 deletions.
4 changes: 3 additions & 1 deletion src/generated/resources/data/tconstruct/recipes/smeltery/entity_melting/bee.json
View file
Expand Up @@ -2,7 +2,9 @@
"type": "tconstruct:entity_melting",
"damage": 2,
"entity": {
"type": "minecraft:bee"
"types": [
"minecraft:bee"
]
},
"result": {
"amount": 25,
Expand Down
4 changes: 3 additions & 1 deletion src/generated/resources/data/tconstruct/recipes/smeltery/entity_melting/blaze.json
View file
Expand Up @@ -2,7 +2,9 @@
"type": "tconstruct:entity_melting",
"damage": 2,
"entity": {
"type": "minecraft:blaze"
"types": [
"minecraft:blaze"
]
},
"result": {
"amount": 20,
Expand Down
4 changes: 3 additions & 1 deletion src/generated/resources/data/tconstruct/recipes/smeltery/entity_melting/creeper.json
View file
Expand Up @@ -2,7 +2,9 @@
"type": "tconstruct:entity_melting",
"damage": 2,
"entity": {
"type": "minecraft:creeper"
"types": [
"minecraft:creeper"
]
},
"result": {
"amount": 50,
Expand Down
4 changes: 3 additions & 1 deletion src/generated/resources/data/tconstruct/recipes/smeltery/entity_melting/drowned.json
View file
Expand Up @@ -2,7 +2,9 @@
"type": "tconstruct:entity_melting",
"damage": 2,
"entity": {
"type": "minecraft:drowned"
"types": [
"minecraft:drowned"
]
},
"result": {
"amount": 20,
Expand Down
4 changes: 3 additions & 1 deletion src/generated/resources/data/tconstruct/recipes/smeltery/entity_melting/ender_slime.json
View file
Expand Up @@ -2,7 +2,9 @@
"type": "tconstruct:entity_melting",
"damage": 2,
"entity": {
"type": "tconstruct:ender_slime"
"types": [
"tconstruct:ender_slime"
]
},
"result": {
"amount": 25,
Expand Down
4 changes: 3 additions & 1 deletion src/generated/resources/data/tconstruct/recipes/smeltery/entity_melting/iron_golem.json
View file
Expand Up @@ -2,7 +2,9 @@
"type": "tconstruct:entity_melting",
"damage": 4,
"entity": {
"type": "minecraft:iron_golem"
"types": [
"minecraft:iron_golem"
]
},
"result": {
"amount": 10,
Expand Down
4 changes: 3 additions & 1 deletion src/generated/resources/data/tconstruct/recipes/smeltery/entity_melting/magma_cube.json
View file
Expand Up @@ -2,7 +2,9 @@
"type": "tconstruct:entity_melting",
"damage": 2,
"entity": {
"type": "minecraft:magma_cube"
"types": [
"minecraft:magma_cube"
]
},
"result": {
"amount": 25,
Expand Down
4 changes: 3 additions & 1 deletion src/generated/resources/data/tconstruct/recipes/smeltery/entity_melting/silverfish.json
View file
Expand Up @@ -2,7 +2,9 @@
"type": "tconstruct:entity_melting",
"damage": 2,
"entity": {
"type": "minecraft:silverfish"
"types": [
"minecraft:silverfish"
]
},
"result": {
"amount": 50,
Expand Down
4 changes: 3 additions & 1 deletion src/generated/resources/data/tconstruct/recipes/smeltery/entity_melting/skeletons.json
View file
Expand Up @@ -6,7 +6,9 @@
"tag": "minecraft:skeletons"
},
{
"type": "minecraft:skeleton_horse"
"types": [
"minecraft:skeleton_horse"
]
}
],
"result": {
Expand Down
4 changes: 3 additions & 1 deletion src/generated/resources/data/tconstruct/recipes/smeltery/entity_melting/sky_slime.json
View file
Expand Up @@ -2,7 +2,9 @@
"type": "tconstruct:entity_melting",
"damage": 2,
"entity": {
"type": "tconstruct:sky_slime"
"types": [
"tconstruct:sky_slime"
]
},
"result": {
"amount": 25,
Expand Down
4 changes: 3 additions & 1 deletion src/generated/resources/data/tconstruct/recipes/smeltery/entity_melting/slime.json
View file
Expand Up @@ -2,7 +2,9 @@
"type": "tconstruct:entity_melting",
"damage": 2,
"entity": {
"type": "minecraft:slime"
"types": [
"minecraft:slime"
]
},
"result": {
"amount": 25,
Expand Down
4 changes: 3 additions & 1 deletion src/generated/resources/data/tconstruct/recipes/smeltery/entity_melting/snow_golem.json
View file
Expand Up @@ -2,7 +2,9 @@
"type": "tconstruct:entity_melting",
"damage": 2,
"entity": {
"type": "minecraft:snow_golem"
"types": [
"minecraft:snow_golem"
]
},
"result": {
"amount": 100,
Expand Down
4 changes: 3 additions & 1 deletion src/generated/resources/data/tconstruct/recipes/smeltery/entity_melting/terracube.json
View file
Expand Up @@ -2,7 +2,9 @@
"type": "tconstruct:entity_melting",
"damage": 2,
"entity": {
"type": "tconstruct:terracube"
"types": [
"tconstruct:terracube"
]
},
"result": {
"amount": 25,
Expand Down
4 changes: 3 additions & 1 deletion src/generated/resources/data/tconstruct/recipes/smeltery/entity_melting/wither.json
View file
Expand Up @@ -2,7 +2,9 @@
"type": "tconstruct:entity_melting",
"damage": 2,
"entity": {
"type": "minecraft:wither"
"types": [
"minecraft:wither"
]
},
"result": {
"amount": 50,
Expand Down
4 changes: 3 additions & 1 deletion src/generated/resources/data/tconstruct/recipes/tools/severing/blaze_head.json
View file
@@ -1,7 +1,9 @@
{
"type": "tconstruct:severing",
"entity": {
"type": "minecraft:blaze"
"types": [
"minecraft:blaze"
]
},
"result": "tconstruct:blaze_head"
}
4 changes: 3 additions & 1 deletion src/generated/resources/data/tconstruct/recipes/tools/severing/blaze_rod.json
View file
@@ -1,7 +1,9 @@
{
"type": "tconstruct:severing",
"entity": {
"type": "minecraft:blaze"
"types": [
"minecraft:blaze"
]
},
"result": {
"count": 2,
Expand Down
4 changes: 3 additions & 1 deletion src/generated/resources/data/tconstruct/recipes/tools/severing/cave_spider_head.json
View file
@@ -1,7 +1,9 @@
{
"type": "tconstruct:severing",
"entity": {
"type": "minecraft:cave_spider"
"types": [
"minecraft:cave_spider"
]
},
"result": "tconstruct:cave_spider_head"
}
4 changes: 3 additions & 1 deletion src/generated/resources/data/tconstruct/recipes/tools/severing/chicken_feather.json
View file
Expand Up @@ -5,6 +5,8 @@
"item": "minecraft:feather"
},
"entity": {
"type": "minecraft:chicken"
"types": [
"minecraft:chicken"
]
}
}
4 changes: 3 additions & 1 deletion src/generated/resources/data/tconstruct/recipes/tools/severing/creeper_head.json
View file
@@ -1,7 +1,9 @@
{
"type": "tconstruct:severing",
"entity": {
"type": "minecraft:creeper"
"types": [
"minecraft:creeper"
]
},
"result": "minecraft:creeper_head"
}
4 changes: 3 additions & 1 deletion src/generated/resources/data/tconstruct/recipes/tools/severing/creeper_tnt.json
View file
@@ -1,7 +1,9 @@
{
"type": "tconstruct:severing",
"entity": {
"type": "minecraft:creeper"
"types": [
"minecraft:creeper"
]
},
"result": "minecraft:tnt"
}
4 changes: 3 additions & 1 deletion src/generated/resources/data/tconstruct/recipes/tools/severing/drowned_head.json
View file
@@ -1,7 +1,9 @@
{
"type": "tconstruct:severing",
"entity": {
"type": "minecraft:drowned"
"types": [
"minecraft:drowned"
]
},
"result": "tconstruct:drowned_head"
}
4 changes: 3 additions & 1 deletion src/generated/resources/data/tconstruct/recipes/tools/severing/earthslime_ball.json
View file
@@ -1,7 +1,9 @@
{
"type": "tconstruct:severing",
"entity": {
"type": "minecraft:slime"
"types": [
"minecraft:slime"
]
},
"result": "minecraft:slime_ball"
}
4 changes: 3 additions & 1 deletion src/generated/resources/data/tconstruct/recipes/tools/severing/ender_dragon_head.json
View file
@@ -1,7 +1,9 @@
{
"type": "tconstruct:severing",
"entity": {
"type": "minecraft:ender_dragon"
"types": [
"minecraft:ender_dragon"
]
},
"result": "minecraft:dragon_head"
}
4 changes: 3 additions & 1 deletion src/generated/resources/data/tconstruct/recipes/tools/severing/enderman_head.json
View file
@@ -1,7 +1,9 @@
{
"type": "tconstruct:severing",
"entity": {
"type": "minecraft:enderman"
"types": [
"minecraft:enderman"
]
},
"result": "tconstruct:enderman_head"
}
4 changes: 3 additions & 1 deletion src/generated/resources/data/tconstruct/recipes/tools/severing/enderslime_ball.json
View file
@@ -1,7 +1,9 @@
{
"type": "tconstruct:severing",
"entity": {
"type": "tconstruct:ender_slime"
"types": [
"tconstruct:ender_slime"
]
},
"result": "tconstruct:ender_slime_ball"
}
4 changes: 3 additions & 1 deletion src/generated/resources/data/tconstruct/recipes/tools/severing/husk_head.json
View file
@@ -1,7 +1,9 @@
{
"type": "tconstruct:severing",
"entity": {
"type": "minecraft:husk"
"types": [
"minecraft:husk"
]
},
"result": "tconstruct:husk_head"
}
4 changes: 3 additions & 1 deletion src/generated/resources/data/tconstruct/recipes/tools/severing/iron_golem_head.json
View file
@@ -1,7 +1,9 @@
{
"type": "tconstruct:severing",
"entity": {
"type": "minecraft:iron_golem"
"types": [
"minecraft:iron_golem"
]
},
"result": "minecraft:carved_pumpkin"
}
4 changes: 3 additions & 1 deletion src/generated/resources/data/tconstruct/recipes/tools/severing/magma_cream.json
View file
@@ -1,7 +1,9 @@
{
"type": "tconstruct:severing",
"entity": {
"type": "minecraft:magma_cube"
"types": [
"minecraft:magma_cube"
]
},
"result": "minecraft:magma_cream"
}
4 changes: 3 additions & 1 deletion src/generated/resources/data/tconstruct/recipes/tools/severing/phantom_membrane.json
View file
@@ -1,7 +1,9 @@
{
"type": "tconstruct:severing",
"entity": {
"type": "minecraft:phantom"
"types": [
"minecraft:phantom"
]
},
"result": "minecraft:phantom_membrane"
}
4 changes: 3 additions & 1 deletion src/generated/resources/data/tconstruct/recipes/tools/severing/piglin_brute_head.json
View file
@@ -1,7 +1,9 @@
{
"type": "tconstruct:severing",
"entity": {
"type": "minecraft:piglin_brute"
"types": [
"minecraft:piglin_brute"
]
},
"result": "tconstruct:piglin_brute_head"
}
4 changes: 3 additions & 1 deletion src/generated/resources/data/tconstruct/recipes/tools/severing/piglin_head.json
View file
@@ -1,7 +1,9 @@
{
"type": "tconstruct:severing",
"entity": {
"type": "minecraft:piglin"
"types": [
"minecraft:piglin"
]
},
"result": "tconstruct:piglin_head"
}
4 changes: 3 additions & 1 deletion src/generated/resources/data/tconstruct/recipes/tools/severing/rabbit_foot.json
View file
Expand Up @@ -2,6 +2,8 @@
"type": "tconstruct:ageable_severing",
"adult_result": "minecraft:rabbit_foot",
"entity": {
"type": "minecraft:rabbit"
"types": [
"minecraft:rabbit"
]
}
}
4 changes: 3 additions & 1 deletion src/generated/resources/data/tconstruct/recipes/tools/severing/shulker_shell.json
View file
@@ -1,7 +1,9 @@
{
"type": "tconstruct:severing",
"entity": {
"type": "minecraft:shulker"
"types": [
"minecraft:shulker"
]
},
"result": "minecraft:shulker_shell"
}
4 changes: 3 additions & 1 deletion src/generated/resources/data/tconstruct/recipes/tools/severing/skeleton_skull.json
View file
@@ -1,7 +1,9 @@
{
"type": "tconstruct:severing",
"entity": {
"type": "minecraft:skeleton"
"types": [
"minecraft:skeleton"
]
},
"result": "minecraft:skeleton_skull"
}

0 comments on commit 10bb3f9

Please sign in to comment.