Skip to content

Commit

Permalink
Added tiered canteens made of different ores than can hold more water
Browse files Browse the repository at this point in the history
  • Loading branch information
Forstride committed Jan 2, 2024
1 parent 8eb8301 commit 6dee3d6
Show file tree
Hide file tree
Showing 110 changed files with 1,928 additions and 72 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.4 2024-01-02T11:01:06.4961003 Tags for minecraft:item mod id toughasnails
// 1.20.4 2024-01-02T07:25:05.8559215 Tags for minecraft:item mod id toughasnails
f05342856fe99891fa5e94bbe8db82a4f75ac41e data/toughasnails/tags/items/cooling_armor.json
35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/cooling_consumed_items.json
7c304628a9c17ca3ba6cd13e199fcf73ad9c974f data/toughasnails/tags/items/cooling_held_items.json
Expand All @@ -7,19 +7,19 @@ eb101cb126ebd917a2c240ff53e1e6e16ba3bf83 data/toughasnails/tags/items/heating_ar
35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/heating_consumed_items.json
efe9e0caf089100a228c46379f3aa70d7f602ddc data/toughasnails/tags/items/heating_held_items.json
35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/hydration/100_hydration_drinks.json
9c0dc65d9f036f654b10088e08368b1a58a41237 data/toughasnails/tags/items/hydration/10_hydration_drinks.json
80da436d00c60f0926a75bfc6452ef3e03d0e4cf data/toughasnails/tags/items/hydration/20_hydration_drinks.json
67139859406093c4ec7fb2563184a349cd422c65 data/toughasnails/tags/items/hydration/10_hydration_drinks.json
afb65ee4d43ae8f9cb63112f16629e0e59db5e3d data/toughasnails/tags/items/hydration/20_hydration_drinks.json
c3717474b5903bcc644087abd9758494594dc09b data/toughasnails/tags/items/hydration/30_hydration_drinks.json
35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/hydration/40_hydration_drinks.json
4fa41e9b41dd839136206b5935757ba390f588a8 data/toughasnails/tags/items/hydration/50_hydration_drinks.json
7fd9471261d08e940601fdecd379217eb90622d1 data/toughasnails/tags/items/hydration/50_hydration_drinks.json
a485e913b63b0237e95ef2af66ed886ba820154a data/toughasnails/tags/items/hydration/60_hydration_drinks.json
35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/hydration/70_hydration_drinks.json
d7b753d45aecdc84f69d294a00dc5271088c2abc data/toughasnails/tags/items/hydration/80_hydration_drinks.json
35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/hydration/90_hydration_drinks.json
35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/poison_chance/100_poison_chance_drinks.json
fc698dddd5a4b2d4d0ef9438b45036416c380b0f data/toughasnails/tags/items/poison_chance/25_poison_chance_drinks.json
f87a1c4dc42b16f1628cfca591895d987e5dc6ca data/toughasnails/tags/items/poison_chance/25_poison_chance_drinks.json
35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/poison_chance/50_poison_chance_drinks.json
ab761c277e9e318f660c08eb4da51946e028f083 data/toughasnails/tags/items/poison_chance/75_poison_chance_drinks.json
cc0aa3bf437ed849deda4e4b64aff3665160dae6 data/toughasnails/tags/items/poison_chance/75_poison_chance_drinks.json
0395ed7d6e3d7510a25d2f4ef8b498b0d8c6c9eb data/toughasnails/tags/items/thirst/10_thirst_drinks.json
35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/thirst/11_thirst_drinks.json
35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/thirst/12_thirst_drinks.json
Expand All @@ -30,12 +30,12 @@ ab761c277e9e318f660c08eb4da51946e028f083 data/toughasnails/tags/items/poison_cha
35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/thirst/17_thirst_drinks.json
35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/thirst/18_thirst_drinks.json
35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/thirst/19_thirst_drinks.json
ab761c277e9e318f660c08eb4da51946e028f083 data/toughasnails/tags/items/thirst/1_thirst_drinks.json
cc0aa3bf437ed849deda4e4b64aff3665160dae6 data/toughasnails/tags/items/thirst/1_thirst_drinks.json
35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/thirst/20_thirst_drinks.json
edb5947f84984a39ab47c98c6fb0b3c3a9a8cc39 data/toughasnails/tags/items/thirst/2_thirst_drinks.json
fc698dddd5a4b2d4d0ef9438b45036416c380b0f data/toughasnails/tags/items/thirst/3_thirst_drinks.json
f87a1c4dc42b16f1628cfca591895d987e5dc6ca data/toughasnails/tags/items/thirst/3_thirst_drinks.json
35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/thirst/4_thirst_drinks.json
4fa41e9b41dd839136206b5935757ba390f588a8 data/toughasnails/tags/items/thirst/5_thirst_drinks.json
7fd9471261d08e940601fdecd379217eb90622d1 data/toughasnails/tags/items/thirst/5_thirst_drinks.json
24b02d22d0e3e4abbeed0c96fc20b8dc05dc5f6e data/toughasnails/tags/items/thirst/6_thirst_drinks.json
a90844d1583073e1a3538fe5afe6e279aa3073b8 data/toughasnails/tags/items/thirst/7_thirst_drinks.json
a8d4693f32c2dabe2f0ff10cb6ccae93882c8530 data/toughasnails/tags/items/thirst/8_thirst_drinks.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.4 2024-01-02T04:23:10.697763 Recipes
// 1.20.4 2024-01-02T07:25:05.8549215 Recipes
09252bd5a872203de304820e8d5c5493afe96cf4 data/toughasnails/advancements/recipes/combat/leaf_boots.json
2da825265e95f5dfc0dd4026e0dafee70c17512c data/toughasnails/advancements/recipes/combat/leaf_chestplate.json
6d96cd4baff66d426c9405852ceed3aa8a3cde8f data/toughasnails/advancements/recipes/combat/leaf_helmet.json
Expand All @@ -17,27 +17,53 @@ db0a08a7c6ccc69ca4625db57d678ce644fdfe49 data/toughasnails/advancements/recipes/
1441a8289dbc285c34bf874d6976315fb41001f0 data/toughasnails/advancements/recipes/food/pumpkin_juice.json
1b3828862b65dcfb0a1e6d99070287e896379558 data/toughasnails/advancements/recipes/food/sweet_berry_juice.json
0c2aa5f66f00c9bb358dcfd2b7b1dd149bdec7ad data/toughasnails/advancements/recipes/redstone/temperature_gauge.json
8b0e1899a965cbcf725172709f9f7f7062c43a5c data/toughasnails/advancements/recipes/tools/empty_canteen.json
44869876c5d15da0418d9a179911a93296cb8f8a data/toughasnails/advancements/recipes/tools/empty_copper_canteen.json
72921dc876362e365bcaa765291ec84bf02b6eeb data/toughasnails/advancements/recipes/tools/empty_diamond_canteen.json
710c937eb23f7b4dcbc915d904fc6a9cb9ca52e1 data/toughasnails/advancements/recipes/tools/empty_gold_canteen.json
c49718f4f3b3c8a7f432c1bd4fa107df604a47f2 data/toughasnails/advancements/recipes/tools/empty_iron_canteen.json
42091e54a271bc4e256aca31c6c0f5f179bd7ecd data/toughasnails/advancements/recipes/tools/empty_leather_canteen.json
2807acbbeb51586ea606fe256b07cf3dfebef97c data/toughasnails/advancements/recipes/tools/empty_netherite_canteen_smithing.json
eb6859b0a41b94e3003405965dadf8f49b465ce0 data/toughasnails/advancements/recipes/tools/netherite_dirty_water_canteen_smithing.json
2ae629d1e33be1d1c4e0b2796298afa806d9246c data/toughasnails/advancements/recipes/tools/netherite_purified_water_canteen_smithing.json
98ac50cc499f0c47fdfdfb9b307120626116a6bb data/toughasnails/advancements/recipes/tools/netherite_water_canteen_smithing.json
9ce52988e0ffa4ebd960125423c6dc331a72aadd data/toughasnails/advancements/recipes/tools/thermometer.json
715184d6dfbadc65234a787d2e8271dce076e7b1 data/toughasnails/recipes/apple_juice.json
7aefc36c9cb1e7393660e57c9bfe2f47e9c472b9 data/toughasnails/recipes/cactus_juice.json
c03137fedf80a5cea96fa69ecc23ddcc733b02bf data/toughasnails/recipes/chorus_fruit_juice.json
4d4f65571791ddb5a8ec9f7c271eaf51cf0df667 data/toughasnails/recipes/empty_canteen.json
621a931c624e91f393ca22939253186876e40873 data/toughasnails/recipes/copper_purified_water_canteen.json
96da20c9eb64283df7947e6272c2286d8b8f2af7 data/toughasnails/recipes/copper_water_canteen.json
0f57768f3726aecdb416ccd231a8603dfb52ede3 data/toughasnails/recipes/diamond_purified_water_canteen.json
af7978ffe03960df8f3f685e994be96fcc5009ac data/toughasnails/recipes/diamond_water_canteen.json
69fa128d3bbc0aa152b4c9c248e8ed5d31227e52 data/toughasnails/recipes/empty_copper_canteen.json
eeec0fb0459e002edf6be30744d90f731da6c1aa data/toughasnails/recipes/empty_diamond_canteen.json
fd9753fb1e2dcfee3a36ce1356defc58785f31ee data/toughasnails/recipes/empty_gold_canteen.json
c2f1aadc3c947308ddb2ffa99ff481d3c2702ee3 data/toughasnails/recipes/empty_iron_canteen.json
7be0520988081ed809cf89cf0f9b2c556a020951 data/toughasnails/recipes/empty_leather_canteen.json
6693eef90bf6bdcdfcf4f50e0df05573fd9df858 data/toughasnails/recipes/empty_netherite_canteen_smithing.json
af1b982b9d1cc7246035fc73abfd1b34fbb1394d data/toughasnails/recipes/glow_berry_juice.json
20abd8e2a4e8172968eab10fe809720fc0160118 data/toughasnails/recipes/gold_purified_water_canteen.json
a2a23e956fe154b4db870456e6e06b3fb6c0e121 data/toughasnails/recipes/gold_water_canteen.json
11beca7698ade01aa272b18b3314a42e552746b0 data/toughasnails/recipes/iron_purified_water_canteen.json
aa5d7b846a2b506c4d93d2f094834d16d8aeded9 data/toughasnails/recipes/iron_water_canteen.json
6cd4c90a0ccbc67304b76d8fd1890c7559bd3289 data/toughasnails/recipes/leaf_boots.json
0dd60dff91f95a5a821842815b45b8ac48d1d554 data/toughasnails/recipes/leaf_chestplate.json
f6b8afa3f1d888f8ae0b390281d275a988a85da5 data/toughasnails/recipes/leaf_helmet.json
124270ddfb0dae3e3c31cdaa521b00047bd8e401 data/toughasnails/recipes/leaf_leggings.json
2b22d9d76f45be7994c9409c236635423ccdf340 data/toughasnails/recipes/leather_purified_water_canteen.json
34ba5d07ce9d0643c108bcf6a6e7d440f672336a data/toughasnails/recipes/leather_water_canteen.json
3832d3998e8c69d60fbd12ae52965337708eddb3 data/toughasnails/recipes/melon_juice.json
9fc8d88fda45a7d46bf4ea80c0f72d88526ce044 data/toughasnails/recipes/netherite_dirty_water_canteen_smithing.json
ad1a5bb6b263d7837b4a30c843cffb7339797487 data/toughasnails/recipes/netherite_purified_water_canteen.json
ce6043b5272c9c6e1dec865399f04e46b038be41 data/toughasnails/recipes/netherite_purified_water_canteen_smithing.json
f67d6861f1202177c42f0d6bf6a1b5b5c54fb59e data/toughasnails/recipes/netherite_water_canteen.json
d15aa59d2053ceaa472b5fad409ca720d37766a5 data/toughasnails/recipes/netherite_water_canteen_smithing.json
23d01cbd22f68c4a24a36a57a11401e9c42d9477 data/toughasnails/recipes/potion.json
e4a98b0325be4fb27194eb56a079871cdc8d4114 data/toughasnails/recipes/pumpkin_juice.json
1ed5721002714ae4029126d79a7b73ac58fa755d data/toughasnails/recipes/purified_water_bottle.json
351a2d892d1bc8eaf091aa41c732953c85b661b0 data/toughasnails/recipes/purified_water_canteen.json
454a67d0df9042690154a1b3b372a5fff586b47d data/toughasnails/recipes/rain_collector.json
2512026dc3a027f39db7e77e023a7017de386b9c data/toughasnails/recipes/sweet_berry_juice.json
e636bfd4fab8d516083454e872c8115f5c15cf27 data/toughasnails/recipes/temperature_gauge.json
b75d1caa0b1dcb9ae14dc02e47bba2a3c4b4a4dc data/toughasnails/recipes/thermometer.json
9e06d792260bac7da2725c0b4ab95e165f6ffbec data/toughasnails/recipes/water_canteen.json
26985bc2361f55479fce0f342c9c2b7573237c7f data/toughasnails/recipes/water_purifier.json
30229579a58927cae7011781b0936f7ca87888a4 data/toughasnails/recipes/wool_boots.json
25ff54ef0230fd94b0f881f7866b571f4729d254 data/toughasnails/recipes/wool_chestplate.json
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_copper_ingot": {
"conditions": {
"items": [
{
"items": [
"minecraft:copper_ingot"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "toughasnails:empty_copper_canteen"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_copper_ingot"
]
],
"rewards": {
"recipes": [
"toughasnails:empty_copper_canteen"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_diamond": {
"conditions": {
"items": [
{
"items": [
"minecraft:diamond"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "toughasnails:empty_diamond_canteen"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_diamond"
]
],
"rewards": {
"recipes": [
"toughasnails:empty_diamond_canteen"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_gold_ingot": {
"conditions": {
"items": [
{
"items": [
"minecraft:gold_ingot"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "toughasnails:empty_gold_canteen"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_gold_ingot"
]
],
"rewards": {
"recipes": [
"toughasnails:empty_gold_canteen"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_iron_ingot": {
"conditions": {
"items": [
{
"items": [
"minecraft:iron_ingot"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "toughasnails:empty_iron_canteen"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_iron_ingot"
]
],
"rewards": {
"recipes": [
"toughasnails:empty_iron_canteen"
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"has_the_recipe": {
"conditions": {
"recipe": "toughasnails:empty_canteen"
"recipe": "toughasnails:empty_leather_canteen"
},
"trigger": "minecraft:recipe_unlocked"
}
Expand All @@ -28,7 +28,7 @@
],
"rewards": {
"recipes": [
"toughasnails:empty_canteen"
"toughasnails:empty_leather_canteen"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_netherite_ingot": {
"conditions": {
"items": [
{
"items": [
"minecraft:netherite_ingot"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "toughasnails:empty_netherite_canteen_smithing"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_netherite_ingot"
]
],
"rewards": {
"recipes": [
"toughasnails:empty_netherite_canteen_smithing"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_netherite_ingot": {
"conditions": {
"items": [
{
"items": [
"minecraft:netherite_ingot"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "toughasnails:netherite_dirty_water_canteen_smithing"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_netherite_ingot"
]
],
"rewards": {
"recipes": [
"toughasnails:netherite_dirty_water_canteen_smithing"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_netherite_ingot": {
"conditions": {
"items": [
{
"items": [
"minecraft:netherite_ingot"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "toughasnails:netherite_purified_water_canteen_smithing"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_netherite_ingot"
]
],
"rewards": {
"recipes": [
"toughasnails:netherite_purified_water_canteen_smithing"
]
}
}
Loading

0 comments on commit 6dee3d6

Please sign in to comment.