Skip to content

Commit

Permalink
Implement potion filling and emptying
Browse files Browse the repository at this point in the history
  • Loading branch information
KnightMiner committed Aug 30, 2020
1 parent 41845d3 commit 1d0964b
Show file tree
Hide file tree
Showing 36 changed files with 1,143 additions and 25 deletions.
20 changes: 20 additions & 0 deletions src/generated/resources/.cache/cache
@@ -1,4 +1,8 @@
eaf9ea781f5220889d762b91e1267309994f1634 data/forge/tags/items/bookshelves.json
3088ccc19c30daf124b3795ff65ba77605a95cea data/forge/tags/items/lingering_bottles.json
f5dc7e8c8dd318fce50ee36315076b34ecaf4d07 data/forge/tags/items/splash_bottles.json
f6375af75aa7a5e3da90bb1ee1af92443bf60456 data/inspirations/advancements/recipes/brewing/recipes/cauldron/potion/lingering_bottle.json
6d0a7b30a3a2a3b282d8b9a02bbb56f4cd4ed464 data/inspirations/advancements/recipes/brewing/recipes/cauldron/potion/splash_bottle.json
7279248197a56ff412d8a80fd981ed6c021d16b6 data/inspirations/advancements/recipes/building_blocks/building/mulch/black.json
ebecb02211e59e8ed475caeae6dc5bdfbd66206b data/inspirations/advancements/recipes/building_blocks/building/mulch/blue.json
d981441c4b29a75e92e33bab9f6ebee026cea21f data/inspirations/advancements/recipes/building_blocks/building/mulch/brown.json
Expand Down Expand Up @@ -86,6 +90,13 @@ b9010ec1e26acf04ccbb3a7a122fbd5874f6f087 data/inspirations/advancements/recipes/
f08cd1437741421130a7937fcf59f9581fc5cb6e data/inspirations/advancements/recipes/cauldron/recipes/cauldron/potato_soup/fill_bowl.json
9735ec5ccd7939a23975b42b0088d8559b1f4620 data/inspirations/advancements/recipes/cauldron/recipes/cauldron/potato_soup/stew_large.json
9180848560d143f76a49b4d6361bafce00b6cf29 data/inspirations/advancements/recipes/cauldron/recipes/cauldron/potato_soup/stew_small.json
b94d4ebfe6caac455ed26e1e509d5a484c48e747 data/inspirations/advancements/recipes/cauldron/recipes/cauldron/potion/lingering_empty.json
201b988649fbf9d9067bfc7d7f522bf7009d6726 data/inspirations/advancements/recipes/cauldron/recipes/cauldron/potion/lingering_fill.json
cd55675de03a5ab74f198d74976afc957dd55fbd data/inspirations/advancements/recipes/cauldron/recipes/cauldron/potion/normal_empty.json
d36129581391dc083d7061f6f981cd155f96dd91 data/inspirations/advancements/recipes/cauldron/recipes/cauldron/potion/normal_fill.json
50f957e7802ea60f4f0a0fba06404cec70454c08 data/inspirations/advancements/recipes/cauldron/recipes/cauldron/potion/splash_empty.json
a58eb8c6f7edc206d86a81595a5cfcd96c123b67 data/inspirations/advancements/recipes/cauldron/recipes/cauldron/potion/splash_fill.json
e976a2112852c14b09e56aa3e98fc8b425c33252 data/inspirations/advancements/recipes/cauldron/recipes/cauldron/potion/tipped_arrow.json
210cfb462de45158e288e671965cc15ff04b6af2 data/inspirations/advancements/recipes/cauldron/recipes/cauldron/rabbit_stew/empty_bowl.json
87f388997184b6119f0c587b0837b6055c5ed461 data/inspirations/advancements/recipes/cauldron/recipes/cauldron/rabbit_stew/fill_bowl.json
bbbb91bd5f75332abff0f00a3df6f419a1dfcc59 data/inspirations/advancements/recipes/cauldron/recipes/cauldron/rabbit_stew/stew_large.json
Expand Down Expand Up @@ -416,6 +427,15 @@ c56b9b6571bce9b432e1d895f992f7704264e2aa data/inspirations/recipes/recipes/cauld
55b751b5237c3c8dbe171f55604e7c7a94df5923 data/inspirations/recipes/recipes/cauldron/potato_soup/item.json
5c712884b3d032ee7763ea4058017d676380b666 data/inspirations/recipes/recipes/cauldron/potato_soup/stew_large.json
9b94bd430988d108d41d966db905382d9d0e7564 data/inspirations/recipes/recipes/cauldron/potato_soup/stew_small.json
c9de2e3800af3d019d81be1eace6d08e6deb7195 data/inspirations/recipes/recipes/cauldron/potion/lingering_bottle.json
3c4d644f1f1072d8a9ada2ff147de2b0bcf15354 data/inspirations/recipes/recipes/cauldron/potion/lingering_empty.json
d9c611348b17634f9ea886a154104241a274db34 data/inspirations/recipes/recipes/cauldron/potion/lingering_fill.json
47424706c9c3dd50cc12453931821682d18a9f5c data/inspirations/recipes/recipes/cauldron/potion/normal_empty.json
49b05c1a42d06cfe853c8519028b6cfe07c2b8d9 data/inspirations/recipes/recipes/cauldron/potion/normal_fill.json
f8323b474fafb97b99f72e735540059420e4daf3 data/inspirations/recipes/recipes/cauldron/potion/splash_bottle.json
19f63976122e48ba4c58d5966fc3e3f88ba2633b data/inspirations/recipes/recipes/cauldron/potion/splash_empty.json
c7e3e2f5fd5b1366c14b1877727c3ba4e2e3dde6 data/inspirations/recipes/recipes/cauldron/potion/splash_fill.json
428ab43caf3f63b0d89be0a41282c6a77872fcad data/inspirations/recipes/recipes/cauldron/potion/tipped_arrow.json
7a8180559d3948ba9cdf3f90f1f9ba75ca9e6628 data/inspirations/recipes/recipes/cauldron/rabbit_stew/empty_bowl.json
aad3506b0cc731722e532198acdb319c5435efa4 data/inspirations/recipes/recipes/cauldron/rabbit_stew/fill_bowl.json
58afa39737eecfe66d86f840732217ca757c6b05 data/inspirations/recipes/recipes/cauldron/rabbit_stew/stew_large.json
Expand Down
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"inspirations:lingering_bottle"
]
}
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"inspirations:splash_bottle"
]
}
@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"inspirations:recipes/cauldron/potion/lingering_bottle"
]
},
"criteria": {
"has_item": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "minecraft:dragon_breath"
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "inspirations:recipes/cauldron/potion/lingering_bottle"
}
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
]
}
@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"inspirations:recipes/cauldron/potion/splash_bottle"
]
},
"criteria": {
"has_item": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"tag": "forge:gunpowder"
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "inspirations:recipes/cauldron/potion/splash_bottle"
}
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
]
}
@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"inspirations:recipes/cauldron/potion/lingering_empty"
]
},
"criteria": {
"has_item": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "minecraft:lingering_potion"
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "inspirations:recipes/cauldron/potion/lingering_empty"
}
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
]
}
@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"inspirations:recipes/cauldron/potion/lingering_fill"
]
},
"criteria": {
"has_item": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"tag": "forge:lingering_bottles"
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "inspirations:recipes/cauldron/potion/lingering_fill"
}
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
]
}
@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"inspirations:recipes/cauldron/potion/normal_empty"
]
},
"criteria": {
"has_item": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "minecraft:potion"
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "inspirations:recipes/cauldron/potion/normal_empty"
}
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
]
}
@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"inspirations:recipes/cauldron/potion/normal_fill"
]
},
"criteria": {
"has_item": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "minecraft:glass_bottle"
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "inspirations:recipes/cauldron/potion/normal_fill"
}
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
]
}
@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"inspirations:recipes/cauldron/potion/splash_empty"
]
},
"criteria": {
"has_item": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "minecraft:splash_potion"
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "inspirations:recipes/cauldron/potion/splash_empty"
}
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
]
}
@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"inspirations:recipes/cauldron/potion/splash_fill"
]
},
"criteria": {
"has_item": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"tag": "forge:splash_bottles"
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "inspirations:recipes/cauldron/potion/splash_fill"
}
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
]
}
@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"inspirations:recipes/cauldron/potion/tipped_arrow"
]
},
"criteria": {
"has_item": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "minecraft:arrow"
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "inspirations:recipes/cauldron/potion/tipped_arrow"
}
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
]
}
@@ -0,0 +1,30 @@
{
"type": "minecraft:crafting_shapeless",
"conditions": [
{
"prop": "recipes_module",
"type": "inspirations:config"
},
{
"prop": "cauldron_potions",
"type": "inspirations:config"
}
],
"ingredients": [
{
"tag": "forge:splash_bottles"
},
{
"tag": "forge:splash_bottles"
},
{
"tag": "forge:splash_bottles"
},
{
"item": "minecraft:dragon_breath"
}
],
"result": {
"item": "inspirations:lingering_bottle"
}
}

0 comments on commit 1d0964b

Please sign in to comment.