Skip to content

Commit

Permalink
Replace IToolScoop with tag
Browse files Browse the repository at this point in the history
  • Loading branch information
thedarkcolour committed Jun 10, 2024
1 parent ea6e5f2 commit bbeb734
Show file tree
Hide file tree
Showing 38 changed files with 1,587 additions and 2,755 deletions.
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
// 1.19.2 2024-06-07T20:45:03.43147 Forestry Item Tags
284cbe547f0a36a7dc74757da8e674a1176c3952 data/forestry/tags/items/combs.json
// 1.19.2 2024-06-08T17:30:08.290079 Forestry Item Tags
a234ccae42a036a8004eaa2d3295ac4086ce4e3f data/forestry/tags/items/combs.json
9f5d66e4017fbcabe22c6702e93310cf271fe042 data/forestry/tags/items/crafting_tables.json
ce1f7b72ce898ae6a000ae70dc79151602ad453c data/forestry/tags/items/drop_honey.json
6fafd27cc6911111337c4acc8a240744fbb5cff8 data/forestry/tags/items/forestry_fruits.json
bfe2b51f18fb4bf13d3180d5895f8edb2e8b33fd data/forestry/tags/items/propolis.json
a3335ca9b18a877755988f2c1c11d3610e971fef data/forestry/tags/items/stamps.json
f22050001898f80959ec85d67334bf2b9bf944e8 data/forestry/tags/items/drop_honey.json
0bea64bcb237cdfaed508cd070dc27c1b6e602c8 data/forestry/tags/items/forestry_fruits.json
965c11d8202565995d18ff684e26d4a52ed05bb5 data/forestry/tags/items/propolis.json
cf0c5a0245a3eeb822d88e53776905fa468d455c data/forestry/tags/items/scoops.json
53d183c7afff28b46bd816cb66c1ed195c2b2c0d data/forestry/tags/items/stamps.json
e736c96d74e1d9b8799f108ba1e8b1e2173926fb data/forge/tags/items/chests.json
997ede0ad811c9479aabe6bd63d0a5b90a75c3e6 data/forge/tags/items/dusts/ash.json
eed585818aac57b9454d52f0b5990c86ac4bfb1a data/forge/tags/items/fences.json
dc6d78677ae8f999c85d4e83f9dcb289e88627a6 data/forge/tags/items/fence_gates.json
dc6d78677ae8f999c85d4e83f9dcb289e88627a6 data/forge/tags/items/fence_gates/wooden.json
768eb4ed319dea9b0ad0456a4df6c06350c99036 data/forge/tags/items/fences.json
0f8e3665fc2098e75c0c4e2aaaaa38607acb5244 data/forge/tags/items/fence_gates.json
0f8e3665fc2098e75c0c4e2aaaaa38607acb5244 data/forge/tags/items/fence_gates/wooden.json
b65391d6ad052635e6a05e52a948999fbe4275cc data/forge/tags/items/gears.json
a8c9d50fad9f4f5fadfdb5b0073b599dda9a140f data/forge/tags/items/gears/bronze.json
246c3d963343027d30575bca49bede0d04d245b6 data/forge/tags/items/gears/copper.json
Expand Down
2,127 changes: 481 additions & 1,646 deletions src/generated/resources/.cache/3887f581e0dc0d35d3fd35922d715f9a11b6fcce

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.19.2 2024-06-07T20:45:03.4494703 Forestry Recipes
// 1.19.2 2024-06-08T17:30:08.2940794 Forestry Recipes
88dc44fcbf9ee8ce847c012e497174c75c3e4551 data/forestry/recipes/acacia_desert_door.json
de1f849fde24b43a22d467214e5f81924e788f78 data/forestry/recipes/acacia_desert_fence.json
659dbe7a9f033985cd1ac4020586c34bc9505f50 data/forestry/recipes/acacia_desert_fence_gate.json
Expand Down Expand Up @@ -421,7 +421,7 @@ baf3b487e75a86526050f8cc1b3a7109ab4907b2 data/forestry/recipes/papaya_fireproof_
8472669d17c65bdb935eea2673788a8b4223b982 data/forestry/recipes/papaya_planks.json
4c3099e7f178a22403ac4feab6dbe9f41c5a5042 data/forestry/recipes/papaya_slab.json
8da2f866b3de11443aecd2ede667491428af7c28 data/forestry/recipes/papaya_stairs.json
134b3d811486c3c9bf2260ba5730b458d5c2e76d data/forestry/recipes/paper_from_letters.json
0daa9333a0ec60cd2b243d85e731052d87e49de0 data/forestry/recipes/paper_from_letters.json
d75a09c7f11d5a4ea0576e86c387e70f891ec7bf data/forestry/recipes/peat_bog_managed.json
0c3f0bd0412c8730ff5f3c19fcdd937b3c1a08fd data/forestry/recipes/peat_bog_managed_from_manual.json
697422e8685d1cde8f593aec360c076182a8d5f5 data/forestry/recipes/peat_bog_manual.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// 1.19.2 2024-06-07T20:45:03.4334695 Forestry Block Tags
// 1.19.2 2024-06-08T17:30:08.3010794 Forestry Block Tags
35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/forestry/tags/blocks/grafter.json
1d5e4be5496555ac8571dc6ba3aa25910f7c456e data/forestry/tags/blocks/palm_logs.json
7f109885f4a02db2b97c6e10b2dfccfd0d523735 data/forestry/tags/blocks/papaya_logs.json
35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/forestry/tags/blocks/scoop.json
e736c96d74e1d9b8799f108ba1e8b1e2173926fb data/forge/tags/blocks/chests.json
eed585818aac57b9454d52f0b5990c86ac4bfb1a data/forge/tags/blocks/fences.json
dc6d78677ae8f999c85d4e83f9dcb289e88627a6 data/forge/tags/blocks/fence_gates.json
dc6d78677ae8f999c85d4e83f9dcb289e88627a6 data/forge/tags/blocks/fence_gates/wooden.json
768eb4ed319dea9b0ad0456a4df6c06350c99036 data/forge/tags/blocks/fences.json
0f8e3665fc2098e75c0c4e2aaaaa38607acb5244 data/forge/tags/blocks/fence_gates.json
0f8e3665fc2098e75c0c4e2aaaaa38607acb5244 data/forge/tags/blocks/fence_gates/wooden.json
bb21d3539a79b0026a6f6669c4d05d2cf714868b data/forge/tags/blocks/ores.json
8bc630a1df34e3623f9a5554a01ae2dfc2362023 data/forge/tags/blocks/ores/apatite.json
6b5b215353862ea81225290f3c38054df67a245f data/forge/tags/blocks/ores/tin.json
Expand All @@ -17,20 +17,20 @@ c74d64c654da6d15a76cd4167268fc9965ef23ca data/forge/tags/blocks/storage_blocks/c
8b3a8ecaabc2db91e27ad34b051647d52a0ad47e data/forge/tags/blocks/storage_blocks/raw_tin.json
ed974f25f4057a6e2a627a4ee061decd56b7d274 data/forge/tags/blocks/storage_blocks/tin.json
fd7f5b8d14cefaa9260c3a25ed12037ccad07bac data/minecraft/tags/blocks/dirt.json
b3fa5798b527246b613764a880d86f1f182d4ec4 data/minecraft/tags/blocks/doors.json
eed585818aac57b9454d52f0b5990c86ac4bfb1a data/minecraft/tags/blocks/fences.json
77cb6b14926202e8651f547f095e7f216f551c74 data/minecraft/tags/blocks/leaves.json
5231c1d9925bb899789937b087ce8896c4d5ab4a data/minecraft/tags/blocks/logs.json
b9693e18870eecdc52a53a4761256893246132d8 data/minecraft/tags/blocks/logs_that_burn.json
d72c60600e18a0f30e493ecf21e634c6ae9caa84 data/minecraft/tags/blocks/mineable/axe.json
a0f99aed2d3d450197d1e917281050728ef667b0 data/minecraft/tags/blocks/mineable/pickaxe.json
df4207dd9c200fad14948d4d1b5e58e63fd7438c data/minecraft/tags/blocks/doors.json
768eb4ed319dea9b0ad0456a4df6c06350c99036 data/minecraft/tags/blocks/fences.json
701110df2851d6408ebee0e19b54d5a7bb3601ad data/minecraft/tags/blocks/leaves.json
4430b563c49be867abe6588b284fc2b29d119f9e data/minecraft/tags/blocks/logs.json
32f1998faa4fd311cf325b6420f6e4b51a27a591 data/minecraft/tags/blocks/logs_that_burn.json
039b6dc62a5ca98ac164d5a9865e9a0190f678dd data/minecraft/tags/blocks/mineable/axe.json
7c193bcec5e9f6f3ed6a3ea45162ad8053c7d9c6 data/minecraft/tags/blocks/mineable/pickaxe.json
a74d324eaacf17486a9612367d49a24299a17723 data/minecraft/tags/blocks/mineable/shovel.json
4f0f5d3a71d5e122fb2e1f8e6ba54801b535d904 data/minecraft/tags/blocks/needs_stone_tool.json
c35e1f38b2ea72c66aa864f6bc4bf41fdcaf7838 data/minecraft/tags/blocks/planks.json
9b1fbdb115bd520c43512a6cc76cc78ea4014020 data/minecraft/tags/blocks/planks.json
aa3ef881a072a72a240e6e382073be189586b71b data/minecraft/tags/blocks/saplings.json
6710bf14018c477558020765bf2b09fb9934138a data/minecraft/tags/blocks/slabs.json
43984a45b7f882d59c537d80b915c3273cac47a2 data/minecraft/tags/blocks/stairs.json
b3fa5798b527246b613764a880d86f1f182d4ec4 data/minecraft/tags/blocks/wooden_doors.json
eed585818aac57b9454d52f0b5990c86ac4bfb1a data/minecraft/tags/blocks/wooden_fences.json
6710bf14018c477558020765bf2b09fb9934138a data/minecraft/tags/blocks/wooden_slabs.json
43984a45b7f882d59c537d80b915c3273cac47a2 data/minecraft/tags/blocks/wooden_stairs.json
10374d20a63734388bac6c9f11d5bf1314197603 data/minecraft/tags/blocks/slabs.json
df8fa6cb9413cf7c5c0245bfd19a3cc883a5058f data/minecraft/tags/blocks/stairs.json
df4207dd9c200fad14948d4d1b5e58e63fd7438c data/minecraft/tags/blocks/wooden_doors.json
768eb4ed319dea9b0ad0456a4df6c06350c99036 data/minecraft/tags/blocks/wooden_fences.json
10374d20a63734388bac6c9f11d5bf1314197603 data/minecraft/tags/blocks/wooden_slabs.json
df8fa6cb9413cf7c5c0245bfd19a3cc883a5058f data/minecraft/tags/blocks/wooden_stairs.json
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.19.2 2024-06-07T20:45:03.4294698 Advancements
1885e7782d109d1a9c59401c586b386a2501ecfe data/forestry/advancements/root.json
// 1.19.2 2024-06-08T17:30:08.2930794 Advancements
673e3c0125d5539b8c1259d74629766b55489baf data/forestry/advancements/root.json
34 changes: 17 additions & 17 deletions src/generated/resources/data/forestry/advancements/root.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,87 +5,87 @@
"items": [
{
"items": [
"forestry:bee_comb_omega"
"forestry:bee_comb_reddened"
]
},
{
"items": [
"forestry:bee_comb_mysterious"
"forestry:bee_comb_stringy"
]
},
{
"items": [
"forestry:bee_comb_irradiated"
"forestry:bee_comb_honey"
]
},
{
"items": [
"forestry:bee_comb_parched"
"forestry:bee_comb_cocoa"
]
},
{
"items": [
"forestry:bee_comb_mossy"
"forestry:bee_comb_simmering"
]
},
{
"items": [
"forestry:bee_comb_frozen"
"forestry:bee_comb_powdery"
]
},
{
"items": [
"forestry:bee_comb_darkened"
"forestry:bee_comb_mellow"
]
},
{
"items": [
"forestry:bee_comb_wheaten"
"forestry:bee_comb_omega"
]
},
{
"items": [
"forestry:bee_comb_reddened"
"forestry:bee_comb_dripping"
]
},
{
"items": [
"forestry:bee_comb_dripping"
"forestry:bee_comb_silky"
]
},
{
"items": [
"forestry:bee_comb_powdery"
"forestry:bee_comb_irradiated"
]
},
{
"items": [
"forestry:bee_comb_cocoa"
"forestry:bee_comb_darkened"
]
},
{
"items": [
"forestry:bee_comb_silky"
"forestry:bee_comb_parched"
]
},
{
"items": [
"forestry:bee_comb_honey"
"forestry:bee_comb_mysterious"
]
},
{
"items": [
"forestry:bee_comb_simmering"
"forestry:bee_comb_frozen"
]
},
{
"items": [
"forestry:bee_comb_mellow"
"forestry:bee_comb_mossy"
]
},
{
"items": [
"forestry:bee_comb_stringy"
"forestry:bee_comb_wheaten"
]
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
"key": {
"#": [
{
"item": "forestry:letter_empty_opened"
"item": "forestry:letter_empty_emptied"
},
{
"item": "forestry:letter_empty_fresh"
},
{
"item": "forestry:letter_empty_emptied"
"item": "forestry:letter_empty_stamped"
},
{
"item": "forestry:letter_empty_stamped"
"item": "forestry:letter_empty_opened"
}
]
},
Expand Down
26 changes: 13 additions & 13 deletions src/generated/resources/data/forestry/tags/items/combs.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
{
"values": [
"forestry:bee_comb_omega",
"forestry:bee_comb_mysterious",
"forestry:bee_comb_irradiated",
"forestry:bee_comb_parched",
"forestry:bee_comb_mossy",
"forestry:bee_comb_frozen",
"forestry:bee_comb_darkened",
"forestry:bee_comb_wheaten",
"forestry:bee_comb_reddened",
"forestry:bee_comb_dripping",
"forestry:bee_comb_powdery",
"forestry:bee_comb_cocoa",
"forestry:bee_comb_silky",
"forestry:bee_comb_stringy",
"forestry:bee_comb_honey",
"forestry:bee_comb_cocoa",
"forestry:bee_comb_simmering",
"forestry:bee_comb_powdery",
"forestry:bee_comb_mellow",
"forestry:bee_comb_stringy"
"forestry:bee_comb_omega",
"forestry:bee_comb_dripping",
"forestry:bee_comb_silky",
"forestry:bee_comb_irradiated",
"forestry:bee_comb_darkened",
"forestry:bee_comb_parched",
"forestry:bee_comb_mysterious",
"forestry:bee_comb_frozen",
"forestry:bee_comb_mossy",
"forestry:bee_comb_wheaten"
]
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"values": [
"forestry:honey_drop_honey",
"forestry:honey_drop_charged",
"forestry:honey_drop_omega"
"forestry:honey_drop_omega",
"forestry:honey_drop_honey"
]
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"values": [
"forestry:fruit_cherry",
"forestry:fruit_chestnut",
"forestry:fruit_dates",
"forestry:fruit_plum",
"forestry:fruit_chestnut",
"forestry:fruit_cherry",
"forestry:fruit_walnut",
"forestry:fruit_lemon",
"forestry:fruit_papaya",
"forestry:fruit_lemon"
"forestry:fruit_walnut"
]
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"values": [
"forestry:propolis_normal",
"forestry:propolis_pulsating",
"forestry:propolis_sticky",
"forestry:propolis_pulsating",
"forestry:propolis_silky"
]
}
5 changes: 5 additions & 0 deletions src/generated/resources/data/forestry/tags/items/scoops.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"forestry:scoop"
]
}
10 changes: 5 additions & 5 deletions src/generated/resources/data/forestry/tags/items/stamps.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"values": [
"forestry:stamp_20n",
"forestry:stamp_5n",
"forestry:stamp_100n",
"forestry:stamp_1n",
"forestry:stamp_2n",
"forestry:stamp_50n",
"forestry:stamp_5n",
"forestry:stamp_10n"
"forestry:stamp_20n",
"forestry:stamp_1n",
"forestry:stamp_10n",
"forestry:stamp_2n"
]
}
Loading

0 comments on commit bbeb734

Please sign in to comment.