Skip to content

Commit

Permalink
Merge pull request #143 from ochotonida/1.16.3
Browse files Browse the repository at this point in the history
Added ToolType ingredient serializer for cutting recipes
  • Loading branch information
vectorwing authored Feb 21, 2021
2 parents cc53039 + 994c803 commit 8adb746
Show file tree
Hide file tree
Showing 49 changed files with 253 additions and 194 deletions.
84 changes: 42 additions & 42 deletions src/generated/resources/.cache/cache
Original file line number Diff line number Diff line change
Expand Up @@ -407,19 +407,19 @@ b783de3b29f37b56bcb2e81c7b08001c9cd15433 data/farmersdelight/recipes/cooking/veg
c0a293cd63227b36f639eb7a33843030551136d2 data/farmersdelight/recipes/cooking/vegetable_soup.json
6e3b5ba173ce14c3530d003548ef6579c3b40642 data/farmersdelight/recipes/cooking_pot.json
5a929fe5c2412b34aca0ccef97bbead04f347173 data/farmersdelight/recipes/crimson_pantry.json
6afa525456f6e4cd16e699b0ab0e10ec35bbe358 data/farmersdelight/recipes/cutting/acacia_door.json
142eae939745d4010f1121d1d5846ca80678f60e data/farmersdelight/recipes/cutting/acacia_log.json
f72c18bf1e439d0c7b452cf6af802b0dee090009 data/farmersdelight/recipes/cutting/acacia_sign.json
66f90536ddbf75902709a4841279dc72d79ecf7c data/farmersdelight/recipes/cutting/acacia_trapdoor.json
2c1bd4be0309f96c91358a9d9fae1d8f97e40a44 data/farmersdelight/recipes/cutting/acacia_wood.json
fee844628d42e8cc68a9b5656837921b3bfa532e data/farmersdelight/recipes/cutting/acacia_door.json
1b73e7c7242cd60b5a0aaabcb5d3da1859878cbf data/farmersdelight/recipes/cutting/acacia_log.json
0ddefcdab5f515610c9de278c5cedbc4f902f341 data/farmersdelight/recipes/cutting/acacia_sign.json
065523d449850d4fcf4a3790c2f807514e4477e3 data/farmersdelight/recipes/cutting/acacia_trapdoor.json
ec2c28065f6e18cf51798ca041eca272ff90032b data/farmersdelight/recipes/cutting/acacia_wood.json
9f0e9a834ed46c0a95d81b136f0a25397df369cb data/farmersdelight/recipes/cutting/apple_pie.json
9d81b1c24841a71a1505a5ef902b7108436255f3 data/farmersdelight/recipes/cutting/beef.json
cacac134ed666fc3a86ea129f5703e2cae73effb data/farmersdelight/recipes/cutting/birch_door.json
49e741d4921160af289d58502f01117c6e28d834 data/farmersdelight/recipes/cutting/birch_log.json
53442c620b2ce6ec9597e7cfc4fd7330267ba452 data/farmersdelight/recipes/cutting/birch_sign.json
27249d870fd5153642b7285886b4d16098811c5c data/farmersdelight/recipes/cutting/birch_trapdoor.json
dcaa959c5b21a936c82c15142a517bd862260062 data/farmersdelight/recipes/cutting/birch_wood.json
c40e3b259d9001639f4dea516084f154c4782be6 data/farmersdelight/recipes/cutting/bricks.json
f5435163162f8511a0e9d518ee4787bfda6722c8 data/farmersdelight/recipes/cutting/birch_door.json
fe5e0a94bf3b6e693c2a17efe8c890200627c6b3 data/farmersdelight/recipes/cutting/birch_log.json
1b4542df84d6228815e73de4ac681a6686e1ef08 data/farmersdelight/recipes/cutting/birch_sign.json
d80ab5d9f11ed212f7fed4646d457cbe28f9efb1 data/farmersdelight/recipes/cutting/birch_trapdoor.json
8728555e6d2760b3881bf67f0a578718000a597d data/farmersdelight/recipes/cutting/birch_wood.json
afe51c56ab8f05caa590489c7095ea2fadbfbaef data/farmersdelight/recipes/cutting/bricks.json
4b0b80ba4ce52942d9f8e0648174b346573418cd data/farmersdelight/recipes/cutting/brown_mushroom_colony.json
f802279130ec734bba166e72d2d7b33d8abf856d data/farmersdelight/recipes/cutting/cabbage.json
3cbc2d6c8e96106ee9b5fa4e85021b4548fdd500 data/farmersdelight/recipes/cutting/cake.json
Expand All @@ -429,51 +429,51 @@ f901e1d070911fb63745525caa8e129b5b299638 data/farmersdelight/recipes/cutting/cod
d383fa94f446506d0e5509a180d6276f89133ee4 data/farmersdelight/recipes/cutting/cooked_chicken.json
b7923e1caed77cc9e661ee26994b2278f750d892 data/farmersdelight/recipes/cutting/cooked_cod.json
44f738a020ae3fd7fb0d3418b7da5cf3d88bac5d data/farmersdelight/recipes/cutting/cooked_salmon.json
9637706c0eaef5db564bc08a1e878607249e14f5 data/farmersdelight/recipes/cutting/crimson_door.json
7b7b9454a8886e7390a7c574f2667ca876805410 data/farmersdelight/recipes/cutting/crimson_hyphae.json
5d9fc93c6b48a11596d720b9be024a2480dc080c data/farmersdelight/recipes/cutting/crimson_sign.json
db7657fe29d00331cc358cbc55c4bf516e08d1d4 data/farmersdelight/recipes/cutting/crimson_stem.json
143ff67a873eb94041478237b7acc927207ce883 data/farmersdelight/recipes/cutting/crimson_trapdoor.json
035799d12f3b4fa2b7c392e0fa91759520542ea1 data/farmersdelight/recipes/cutting/dark_oak_door.json
4cfbf4f084f88c31c5bec31e4179af2595540e8d data/farmersdelight/recipes/cutting/dark_oak_log.json
6a7210ee48febf664302d8c84310dcc8eb25bce6 data/farmersdelight/recipes/cutting/dark_oak_sign.json
cfbcaab9287563b95adf392cfde2387cdeba1e87 data/farmersdelight/recipes/cutting/dark_oak_trapdoor.json
f735ae6a790789f4cfca9888bc533a594a2e154d data/farmersdelight/recipes/cutting/dark_oak_wood.json
ae333cae5498aa6ff95d1cd5226291c6469d09e9 data/farmersdelight/recipes/cutting/crimson_door.json
e1a837fd1ee8c83d8ac6b349361267fb722f4713 data/farmersdelight/recipes/cutting/crimson_hyphae.json
7401f0fbf7802af8fff23e40ccd7cae29c7bd016 data/farmersdelight/recipes/cutting/crimson_sign.json
0ddf420f64127362230cf34e37c0778cbd5cba5c data/farmersdelight/recipes/cutting/crimson_stem.json
15f50bfd456abba863c66f2e6627268c9991f387 data/farmersdelight/recipes/cutting/crimson_trapdoor.json
8bb200c2eb4d8f284e26b82054e2a57b6c3a1767 data/farmersdelight/recipes/cutting/dark_oak_door.json
84b1714b0c2c98d1dee5510425a6047155c4c775 data/farmersdelight/recipes/cutting/dark_oak_log.json
1a9e49d794c002612ea3a0020899419c6a1c885a data/farmersdelight/recipes/cutting/dark_oak_sign.json
59d9e838eeb2262f4d98b768b7ff6c39a384941a data/farmersdelight/recipes/cutting/dark_oak_trapdoor.json
e9895a181ef95f39b364f35804b121b974f05809 data/farmersdelight/recipes/cutting/dark_oak_wood.json
f0475d42bf07c9ea01becafc8aaf8842233f74c9 data/farmersdelight/recipes/cutting/ham.json
6c4acd43110022b3fbf2c84ab4bfe29cfda91106 data/farmersdelight/recipes/cutting/jungle_door.json
4ab1f4d2d117b2ba5c663feebc0ae80ef4bdda48 data/farmersdelight/recipes/cutting/jungle_log.json
c1fc5ae2182767941abf0b8e0bd5d081d35eefc8 data/farmersdelight/recipes/cutting/jungle_sign.json
046615d5ed65576097593432f7875ca87aaf0957 data/farmersdelight/recipes/cutting/jungle_trapdoor.json
17c9a5327b4667a332e362c2f8b16c7666efad62 data/farmersdelight/recipes/cutting/jungle_wood.json
e6adab1d7a297f51f983e85b9be5e8ed36c98857 data/farmersdelight/recipes/cutting/jungle_door.json
ac49058d68148ba67d1e79d433429264216ec0b2 data/farmersdelight/recipes/cutting/jungle_log.json
495104fcac11c01b864f5f733014b70cfb67537a data/farmersdelight/recipes/cutting/jungle_sign.json
cc3ea23ad47409add24e4d5e208286081f42eac8 data/farmersdelight/recipes/cutting/jungle_trapdoor.json
5e46951680bf3a15db811d5edaff10a700c69105 data/farmersdelight/recipes/cutting/jungle_wood.json
ee0bd5574f9ebcd2e2d479744ffbf57dabb9863d data/farmersdelight/recipes/cutting/leather_boots.json
d8cbf29dc6f312a727643b7bcd844c801ef1fbec data/farmersdelight/recipes/cutting/leather_chestplate.json
4accbc37f2ee0d6af88026952b64f0ea9c1b8fb4 data/farmersdelight/recipes/cutting/leather_helmet.json
af758624c08a745f2075b5499d6c3d36fe115625 data/farmersdelight/recipes/cutting/leather_leggings.json
da8965db0130401c8b7f60d2e0004c381408a86b data/farmersdelight/recipes/cutting/melon.json
e0303b43d4c488b06a22982979c07068237bdffd data/farmersdelight/recipes/cutting/nether_bricks.json
25ac0371bca2dcc3bcc997b6587dee3b294e5f0e data/farmersdelight/recipes/cutting/oak_door.json
7d163f15a069e427d74a4b2ba39a8fa02f929f5b data/farmersdelight/recipes/cutting/oak_log.json
ec4594e5f53a21338cc9823d8cea9f7e98d57d3f data/farmersdelight/recipes/cutting/oak_sign.json
6b2fb5a4607c607e5fa1eb0fad87ad59d62f199c data/farmersdelight/recipes/cutting/oak_trapdoor.json
065dd10fe0a5fcc3cf986a09099b857ebfa0612d data/farmersdelight/recipes/cutting/oak_wood.json
d8a9b511dc31e6f506909b93f2c85e54e6405e03 data/farmersdelight/recipes/cutting/nether_bricks.json
e071f419b9a34f4cc078db5871ef23e8198cbab3 data/farmersdelight/recipes/cutting/oak_door.json
6c9babe81caca58357e2b5eadb75c503ffa78739 data/farmersdelight/recipes/cutting/oak_log.json
bbdf37bd140924e7e1a52f0caa2260f448cc5f50 data/farmersdelight/recipes/cutting/oak_sign.json
83e7ab8240c20d5146caec91498d9b7b62c24fe2 data/farmersdelight/recipes/cutting/oak_trapdoor.json
062c98a5966ece7026102cdd8e08e05bed4ab0a8 data/farmersdelight/recipes/cutting/oak_wood.json
12ef71e8948493020c9913fb413daa04aa4aee45 data/farmersdelight/recipes/cutting/porkchop.json
d341d4759ada5512474f8348855de202eed96e78 data/farmersdelight/recipes/cutting/pumpkin.json
1c9f86d9435b826a571516476e30769688c14d45 data/farmersdelight/recipes/cutting/red_mushroom_colony.json
1593d1144ac1399bc7d8f25a3b8797dcbec12078 data/farmersdelight/recipes/cutting/rice_panicle.json
3af121b7cf9ecefaaed1bca294ca812214479ed9 data/farmersdelight/recipes/cutting/saddle.json
956e804fd912459fb069fe6b102ffedf1473bec9 data/farmersdelight/recipes/cutting/salmon.json
a6ff9b90b2125dcb64d74e7cf49cfaeab9d44782 data/farmersdelight/recipes/cutting/smoked_ham.json
f221af11ba8b19df3bcf809cb3ae5ba8ea76fe9b data/farmersdelight/recipes/cutting/spruce_door.json
86a429ef60d896c15f7eb10f613de4f88f5299dc data/farmersdelight/recipes/cutting/spruce_log.json
9b1407548f4b5b7be63cd15e6bce2393096f07dc data/farmersdelight/recipes/cutting/spruce_sign.json
6d8405aeb1f8d13c6eda33bd9414a167a292969f data/farmersdelight/recipes/cutting/spruce_trapdoor.json
189f36300b7ee4eccdc230344d39154ff5368efd data/farmersdelight/recipes/cutting/spruce_wood.json
df85d809dd978062e4e37e0426d9fae47df46a30 data/farmersdelight/recipes/cutting/spruce_door.json
4e0b6bd7659b20d4381bcd1066f0d9263811cb31 data/farmersdelight/recipes/cutting/spruce_log.json
b8895821a9863bf271d03686e3c16d593a323675 data/farmersdelight/recipes/cutting/spruce_sign.json
f43bc73ae7f10b3bfd9e8a95693ca8b18a4788a0 data/farmersdelight/recipes/cutting/spruce_trapdoor.json
5825b638daeb4f2089f53520d48efd91b3155284 data/farmersdelight/recipes/cutting/spruce_wood.json
51905031fcbad1da32c7865e2b92932fd53ffa49 data/farmersdelight/recipes/cutting/sweet_berry_cheesecake.json
35f8c5d7b40187bb644d177e698d6be8ff9283bf data/farmersdelight/recipes/cutting/warped_door.json
7c451fbf4b11f56a2f4f9a9480598465328efbc8 data/farmersdelight/recipes/cutting/warped_hyphae.json
b74c4ab10cbf74673ddd052a4023c15c02a4a673 data/farmersdelight/recipes/cutting/warped_sign.json
f8944e4988864c3ee98da5e5aa4ff06e7bb0b617 data/farmersdelight/recipes/cutting/warped_stem.json
226a4b3b649b8efb0cd8b5ed4a90cb559d41bb29 data/farmersdelight/recipes/cutting/warped_trapdoor.json
2986bea80f127f04912d2e69dc1159e15d081741 data/farmersdelight/recipes/cutting/warped_door.json
acf85beba2cd3528561d2c0344dabd7566e67690 data/farmersdelight/recipes/cutting/warped_hyphae.json
ff85e4344750200d4a9561017020f6513b677842 data/farmersdelight/recipes/cutting/warped_sign.json
46d07ec65280e5ef1aad903917b34867ec214cfa data/farmersdelight/recipes/cutting/warped_stem.json
716cdf2d287fc1ea005a0f3342ef5c53491ee5fd data/farmersdelight/recipes/cutting/warped_trapdoor.json
a1afaa4f8dcc43689fb3ffa65f9c6c9c9eee19de data/farmersdelight/recipes/cutting_board.json
fe5879ed2f883ee8471c4e5dbada068c969f9e24 data/farmersdelight/recipes/dark_oak_pantry.json
6cf798a8915d956e5d9e3139e027c31b9903b1e0 data/farmersdelight/recipes/diamond_knife.json
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
}
],
"tool": {
"type": "axe"
"type": "farmersdelight:tool",
"tool": "axe"
},
"result": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
}
],
"tool": {
"type": "axe"
"type": "farmersdelight:tool",
"tool": "axe"
},
"result": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
}
],
"tool": {
"type": "axe"
"type": "farmersdelight:tool",
"tool": "axe"
},
"result": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
}
],
"tool": {
"type": "axe"
"type": "farmersdelight:tool",
"tool": "axe"
},
"result": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
}
],
"tool": {
"type": "axe"
"type": "farmersdelight:tool",
"tool": "axe"
},
"result": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
}
],
"tool": {
"type": "axe"
"type": "farmersdelight:tool",
"tool": "axe"
},
"result": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
}
],
"tool": {
"type": "axe"
"type": "farmersdelight:tool",
"tool": "axe"
},
"result": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
}
],
"tool": {
"type": "axe"
"type": "farmersdelight:tool",
"tool": "axe"
},
"result": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
}
],
"tool": {
"type": "axe"
"type": "farmersdelight:tool",
"tool": "axe"
},
"result": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
}
],
"tool": {
"type": "axe"
"type": "farmersdelight:tool",
"tool": "axe"
},
"result": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
}
],
"tool": {
"type": "pickaxe"
"type": "farmersdelight:tool",
"tool": "pickaxe"
},
"result": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
}
],
"tool": {
"type": "axe"
"type": "farmersdelight:tool",
"tool": "axe"
},
"result": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
}
],
"tool": {
"type": "axe"
"type": "farmersdelight:tool",
"tool": "axe"
},
"result": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
}
],
"tool": {
"type": "axe"
"type": "farmersdelight:tool",
"tool": "axe"
},
"result": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
}
],
"tool": {
"type": "axe"
"type": "farmersdelight:tool",
"tool": "axe"
},
"result": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
}
],
"tool": {
"type": "axe"
"type": "farmersdelight:tool",
"tool": "axe"
},
"result": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
}
],
"tool": {
"type": "axe"
"type": "farmersdelight:tool",
"tool": "axe"
},
"result": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
}
],
"tool": {
"type": "axe"
"type": "farmersdelight:tool",
"tool": "axe"
},
"result": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
}
],
"tool": {
"type": "axe"
"type": "farmersdelight:tool",
"tool": "axe"
},
"result": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
}
],
"tool": {
"type": "axe"
"type": "farmersdelight:tool",
"tool": "axe"
},
"result": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
}
],
"tool": {
"type": "axe"
"type": "farmersdelight:tool",
"tool": "axe"
},
"result": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
}
],
"tool": {
"type": "axe"
"type": "farmersdelight:tool",
"tool": "axe"
},
"result": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
}
],
"tool": {
"type": "axe"
"type": "farmersdelight:tool",
"tool": "axe"
},
"result": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
}
],
"tool": {
"type": "axe"
"type": "farmersdelight:tool",
"tool": "axe"
},
"result": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
}
],
"tool": {
"type": "axe"
"type": "farmersdelight:tool",
"tool": "axe"
},
"result": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
}
],
"tool": {
"type": "axe"
"type": "farmersdelight:tool",
"tool": "axe"
},
"result": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
}
],
"tool": {
"type": "pickaxe"
"type": "farmersdelight:tool",
"tool": "pickaxe"
},
"result": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
}
],
"tool": {
"type": "axe"
"type": "farmersdelight:tool",
"tool": "axe"
},
"result": [
{
Expand Down
Loading

0 comments on commit 8adb746

Please sign in to comment.