Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Vanilla Compatibility and Phosphor Changes #187

Open
wants to merge 23 commits into
base: 1.20.1
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
dbcd019
Added Luminous Comb and Volcanic Propolis
Spearkiller Feb 23, 2025
70024c0
Updated recipes involving phosphor to use volcanic propolis instead
Spearkiller Feb 23, 2025
40ab4b3
Added a recipe to turn Ice Shards into ice
Spearkiller Feb 23, 2025
47b7492
Added recipes for phosphor torches and beeswax candles
Spearkiller Feb 23, 2025
dc2001b
Added a recipe to turn vanilla combs into beeswax
Spearkiller Feb 23, 2025
b8736fb
Removed Honey Pot, added Vanilla Honey Compat
Spearkiller Feb 23, 2025
43257f1
fixed a miscalculation in previous commit
Spearkiller Feb 23, 2025
549342f
run datagen for new assets
Spearkiller Feb 23, 2025
9f568f2
Added models that weren't datagened
Spearkiller Feb 23, 2025
082a2ef
Changed colouring of Luminous and Simmering combs
Spearkiller Feb 23, 2025
102ef55
fixed new recipes overwriting vanilla ones
Spearkiller Feb 23, 2025
0f2f319
made candles 50% cheaper
Spearkiller Feb 23, 2025
bd02003
made phosphorous less plentiful
Spearkiller Feb 23, 2025
8fc86c5
Lush line of bees now actually make Luminous Comb
Spearkiller Feb 23, 2025
d347ba9
Phosphor can now be used to make Glowing Item Frames
Spearkiller Feb 23, 2025
4ae31d2
Soft revert of Honey Pot removal
Spearkiller Feb 28, 2025
b41e77d
Update ForestryRecipeProvider.java
Spearkiller Feb 28, 2025
16f6935
Removed Luminous Comb as per recommendations
Spearkiller Mar 1, 2025
8b434c8
Changed phosphorusfrom a specialty to a product
Spearkiller Mar 1, 2025
9c4ba77
Merge branch '1.20.1' into phosphorescent-update
Spearkiller Mar 1, 2025
2360f72
Removed String -> Silk centrifuge recipe
Spearkiller Mar 2, 2025
063d384
Reduced cost for Woven Silk
Spearkiller Mar 2, 2025
6849e57
forgot to add file to commit
Spearkiller Mar 2, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.1 2025-02-26T20:39:23.2727605 Tags for minecraft:item mod id forestry
// 1.20.1 2025-03-01T16:44:21.446073 Tags for minecraft:item mod id forestry
37a390e7a402ae2ce1addd2b8bbefd6229e8c7c6 data/forestry/tags/items/acacia_desert_logs.json
35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/forestry/tags/items/backpack/allow/adventurer.json
426fdc880d77e5feaa70125d93a57b7ce21dbc2b data/forestry/tags/items/backpack/allow/builder.json
Expand Down Expand Up @@ -39,7 +39,7 @@ c650452f3c2c7523b5d43f7a54ddebe133610760 data/forestry/tags/items/padauk_logs.js
24f3c0c5b75c3d2795315ab535de9a7cb30879c0 data/forestry/tags/items/pine_logs.json
57a3ddceb21b169b8704e697fd89e03ac1c75cef data/forestry/tags/items/plum_logs.json
1e2ec9fb02b1b3126fa83d7bc90fe335db9e48b6 data/forestry/tags/items/poplar_logs.json
794cdff7b3d1a97e7cec2815b209d867bf747502 data/forestry/tags/items/propolis.json
d013a58efdcf5f8209c8db9f75ede3023e29dde4 data/forestry/tags/items/propolis.json
cf0c5a0245a3eeb822d88e53776905fa468d455c data/forestry/tags/items/scoops.json
5001373d3cdbe55ab238e1c82b521698c299e190 data/forestry/tags/items/sequoia_logs.json
c0020e6f377758179d2d7f23812e757851ba1ff2 data/forestry/tags/items/stamps.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.1 2025-02-26T20:39:23.2752733 Item Models: forestry
// 1.20.1 2025-03-01T16:44:21.4470708 Item Models: forestry
3c1431dcb893b5f5648a30b08115a67d8f3227b9 assets/forestry/models/item/adventurer_bag.json
994d21141a5584825744129df0166a56876860ad assets/forestry/models/item/adventurer_bag_woven.json
3c1431dcb893b5f5648a30b08115a67d8f3227b9 assets/forestry/models/item/apiarist_bag.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.1 2025-01-15T20:49:54.1588466 ModKit Item Models for mod 'forestry'
// 1.20.1 2025-03-01T16:44:21.4440783 ModKit Item Models for mod 'forestry'
5c9a34aaa9fead3fd80793cfe9596223bf8783f0 assets/forestry/models/item/acacia_desert_boat.json
72934de9e502d03a3a3cf9f0f6d4f24e8ee34571 assets/forestry/models/item/acacia_desert_chest_boat.json
9b0e3ae0b83b5c30fe64d5488c10a81b21c890ac assets/forestry/models/item/balsa_boat.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.1 2025-02-27T13:42:57.0413617 Loot Tables
// 1.20.1 2025-03-01T16:44:21.4301145 Loot Tables
41fb17dab11f0d0ac4c695eb706119b894401c59 data/forestry/loot_tables/blocks/acacia_desert_button.json
cd06ea8f3c3db3fc055cc6b07393f6aa938e0525 data/forestry/loot_tables/blocks/acacia_desert_door.json
0826e330e65982a3be8d6b9d0987e5fc526d62dd data/forestry/loot_tables/blocks/acacia_desert_fence.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.1 2025-02-26T20:39:23.2835601 Recipes
// 1.20.1 2025-03-02T14:12:45.9605369 Recipes
6867bbb8c2b291d6e111aae900a9ce8be0cf8ebe data/forestry/advancements/recipes/building_blocks/acacia_desert_fence.json
92d402b3f91419af71a9913fbddab9c5e9183779 data/forestry/advancements/recipes/building_blocks/acacia_desert_fence_gate.json
756f6f4fa8d9fdc7fe1895f6bd02cb5e107c6acf data/forestry/advancements/recipes/building_blocks/acacia_desert_fireproof_fence.json
Expand Down Expand Up @@ -495,11 +495,11 @@ ddd13627862cf981ee63043d6b92679be5c3f027 data/forestry/advancements/recipes/buil
44387f39d52bd77df8b1e78ae4e3b64330d1b823 data/forestry/advancements/recipes/combat/apiarist_helmet.json
0e3579cc024fe1833308e1b09e7a3b014411f468 data/forestry/advancements/recipes/combat/apiarist_legs.json
740cc07b9bb42c8b8a9dbc777bee15f27c6c463c data/forestry/advancements/recipes/food/ambrosia.json
751ddcfa6f926905eb5aa3c7bcc2894cba7e18c9 data/forestry/advancements/recipes/food/bottled_honey_drops.json
7fa04d2e451a6063f29f2e7bd3833542be4dcaf0 data/forestry/advancements/recipes/food/cake_can.json
3bed3db00b9bf0ed60129aacd9adb9ea32dbd6d4 data/forestry/advancements/recipes/food/cake_capsule.json
357b08244ec3e750157867345c21b1f3d8128df3 data/forestry/advancements/recipes/food/cake_refractory.json
df9beabe33af04eff31ada6c036c61fa51abe773 data/forestry/advancements/recipes/food/honeyed_slice.json
cee60cbfcbe0155bc10f0381862e8ad707d3dcf7 data/forestry/advancements/recipes/food/honey_pot.json
6c15d48606494436dc3137f1a46bff69299436a7 data/forestry/advancements/recipes/misc/acacia_desert_boat.json
3b1bad782e753aec655b7b03190972bc49e639e2 data/forestry/advancements/recipes/misc/acacia_desert_chest_boat.json
8bcfb98e9d25ff374742a0a0f5af0aace4290227 data/forestry/advancements/recipes/misc/acacia_desert_hanging_sign.json
Expand All @@ -521,6 +521,7 @@ c4b2bd1741b3652c72bc82c629aa04149a691346 data/forestry/advancements/recipes/misc
a333e87ca8fb89b8c43355d1df5db8c067148e33 data/forestry/advancements/recipes/misc/baobab_chest_boat.json
f8a69aaf14edfb67b7df69b8e02f2c7abf98b277 data/forestry/advancements/recipes/misc/baobab_hanging_sign.json
d3835d91fcd49e2f1eb3f789d47dcae5a211d957 data/forestry/advancements/recipes/misc/baobab_sign.json
6a20575dc36cd82b639118a5a9addc7123e09c3d data/forestry/advancements/recipes/misc/beeswax_candles.json
31af2ce23ab7dbf745d2c322854c195c3c227b6a data/forestry/advancements/recipes/misc/bee_chest.json
f2854aa6011beb0d5a47fb1f1cba569df441083e data/forestry/advancements/recipes/misc/bee_house.json
05db480b510e48bf86dce2aae4dbd5928b383654 data/forestry/advancements/recipes/misc/bituminous_peat.json
Expand All @@ -547,6 +548,7 @@ a283485f3ffdf8926255c9e9bdcdffb638cc322a data/forestry/advancements/recipes/misc
da1460eddf4c0c713f5471ba4bdad95fcbf996b5 data/forestry/advancements/recipes/misc/cocobolo_sign.json
1f4299d745f7a799a068c7af48b42b927d925882 data/forestry/advancements/recipes/misc/compost_ash.json
521594dbb0fa9b3b633b630b90714b2ab1c35ebf data/forestry/advancements/recipes/misc/compost_wheat.json
b52d4c06873e9d5186552fd1e8d7f6ae973535b7 data/forestry/advancements/recipes/misc/compressed_ice_shards.json
0c419d1437b46a16c19eab0af91467fd76542225 data/forestry/advancements/recipes/misc/ebony_boat.json
3e0615dcbf4392031f064f5081a77f259fd59cc7 data/forestry/advancements/recipes/misc/ebony_chest_boat.json
ebb3b74bd297cda88e62dae25e8ac4cd8a790a1a data/forestry/advancements/recipes/misc/ebony_hanging_sign.json
Expand Down Expand Up @@ -650,6 +652,7 @@ d4a587600d39bcce32ae10d2e553514a17e16f3b data/forestry/advancements/recipes/misc
0b4c064ad24d4adc459bdafef02d1ef3cfa5f3b0 data/forestry/advancements/recipes/misc/hill_cherry_chest_boat.json
5f679dad705c2cabb68803b6827554f016212317 data/forestry/advancements/recipes/misc/hill_cherry_hanging_sign.json
f4f7edfed57be773973467177d6e7d451ccae47d data/forestry/advancements/recipes/misc/hill_cherry_sign.json
cbbc5735c09a9012fa45e9daa8f132e63c53445b data/forestry/advancements/recipes/misc/honey_drop_block.json
92229218f6b39eff9b35192b6a2a095df7184e18 data/forestry/advancements/recipes/misc/ingot_bronze_alloying.json
7a1ee44d3cfbe3f2522ae0ef81fe3789c00a3b1a data/forestry/advancements/recipes/misc/ingot_bronze_from_resource_storage_bronze.json
76ab245ee1dec50f310908235cace2069e794fee data/forestry/advancements/recipes/misc/ingot_tin.json
Expand Down Expand Up @@ -702,6 +705,7 @@ d4da831c1b7c8a899a8c6e927772333d95d18be3 data/forestry/advancements/recipes/misc
e32de4e5cf4a964233d5bd7d32ffb50bdebdc750 data/forestry/advancements/recipes/misc/peat_bog_managed.json
8ebf4ee2f519e3e3cd7a13161d799fb76082560c data/forestry/advancements/recipes/misc/peat_bog_managed_from_manual.json
c9520aef1322eb0d3bb424a0809264c62dba61fd data/forestry/advancements/recipes/misc/peat_bog_manual.json
e5d68cd17ce090dc1424ad08d3aba33b4f71d117 data/forestry/advancements/recipes/misc/phosphor_torches.json
8f20e9ae3b5f9409cfdfa8101b1752d87d7ca9b8 data/forestry/advancements/recipes/misc/pine_boat.json
5be8175ccc310c709b902bf19aad8dd55169151a data/forestry/advancements/recipes/misc/pine_chest_boat.json
0eef09507e0a23f7277db949f0fd1eb69efd7ef1 data/forestry/advancements/recipes/misc/pine_hanging_sign.json
Expand Down Expand Up @@ -1000,6 +1004,7 @@ d37cc67177c73903646b8843bb112158a1ff5571 data/forestry/recipes/baobab_slab.json
b8a4e92f31aa2d52869973e9cb95668609c9e05d data/forestry/recipes/baobab_stripped_wood.json
eca71aba70cd7a248471ee015544566d48572ad7 data/forestry/recipes/baobab_trapdoor.json
32334b5b770dc9f2b171314712f3aaddd66a9111 data/forestry/recipes/baobab_wood.json
c9865928833effc368c0d275687dab764055c141 data/forestry/recipes/beeswax_candles.json
88de9ed5a1b917654c479c69e0721564985c54e6 data/forestry/recipes/bee_chest.json
13600cad95403060d0899858e0a8d23758e304bf data/forestry/recipes/bee_house.json
9e2ce5e0ba6d35d0039d2cfcad6c5bc18872b574 data/forestry/recipes/birch_door.json
Expand Down Expand Up @@ -1030,6 +1035,7 @@ c025efabde34b093118fbdd15712b0ea88fc2d5f data/forestry/recipes/block_bee_comb_si
281a0d0095e248e0da0928e9ecd80b8e8f39e30a data/forestry/recipes/bog_earth_can.json
cb69e794d2b5547320a13441880a8b868345a6f9 data/forestry/recipes/bog_earth_refractory.json
79db573e173384d72187238af6f1334bbe439b1d data/forestry/recipes/bog_earth_wax_capsule.json
8e56aab045b010be6fd685aef77c85093ea2b837 data/forestry/recipes/bottled_honey_drops.json
efa4f246f13a93142a5198d4b68914181a74a283 data/forestry/recipes/bottler.json
243c4b8c17c41051c73e05ae14bcc67c99a3b3fa data/forestry/recipes/bronze_pickaxe.json
04743ae989b2aa95075fe16ca5ddf58b36f558b4 data/forestry/recipes/bronze_shovel.json
Expand Down Expand Up @@ -1229,10 +1235,11 @@ c0a8257e5827e532549a6eed0adbb5288e1bb881 data/forestry/recipes/carpenter/reclaim
004131405115082a22809b36759700849a820887 data/forestry/recipes/carpenter/scented_paneling.json
76d6aa78a49b3bdc9ed50bf0934c30c75f411331 data/forestry/recipes/carpenter/soldering_iron.json
b8078710e4c560f89d6b6002953bcb1f12d2e837 data/forestry/recipes/carpenter/wood_pulp.json
1ac6c850c6ec7d3de0d690142c3e757e7e34c7d9 data/forestry/recipes/carpenter/woven_silk.json
98384b7c1dea5346c267319a35481a85b98dcb49 data/forestry/recipes/carpenter/woven_silk.json
f30d2a71f6d1c471b28714f9e6e70aba23591eee data/forestry/recipes/catalogue.json
30a42f1e04964d99dbb7a92a351da31ac0959e1d data/forestry/recipes/centrifuge.json
8349380b3e5512f94955e19079b2221dd5eb1112 data/forestry/recipes/centrifuge/cocoa_comb.json
ccc151e2c5870982e9ecae00e63acfb377be6a24 data/forestry/recipes/centrifuge/comb_to_wax.json
cf76ddd67961b94dbc685f0de62533a651717f9c data/forestry/recipes/centrifuge/dripping_comb.json
f555e2af3563f00e5ae768ba9cd861e2e86f3dc7 data/forestry/recipes/centrifuge/frozen_comb.json
88fdef7da6ce2b2e52ac9dafae42d7c6c9aea904 data/forestry/recipes/centrifuge/honey_comb.json
Expand All @@ -1244,8 +1251,7 @@ c4303a72c20ee706e8c8641afb719f83cc45a36a data/forestry/recipes/centrifuge/myster
e7be8cdd5fdc0bc68ae5e5745ceb585c16016728 data/forestry/recipes/centrifuge/powdery_comb.json
b8ef95d2d012aa5bf6c0feb3daf907a5d6aed5c5 data/forestry/recipes/centrifuge/silky_comb.json
4aec683e1075cc65d8a6426cfee12f8afd94ff31 data/forestry/recipes/centrifuge/silky_propolis.json
176fa575484078f068f31b57b186f94555042caf data/forestry/recipes/centrifuge/simmering_comb.json
83a59ff86b080cbcd130e1d96683aefdf42c49a4 data/forestry/recipes/centrifuge/string.json
cd828fb95496bf29003d6e0fbf5a24ed83a9a44b data/forestry/recipes/centrifuge/simmering_comb.json
d1fdecaf5e2deeeae7d4af8ad515d1dcc323f1ef data/forestry/recipes/centrifuge/stringy_comb.json
f26a594d83f5c98a6647d465900f68b71fbb4203 data/forestry/recipes/centrifuge/wheaten_comb.json
3b812faa0618ea8370303f85e9ed530f4a01a6f8 data/forestry/recipes/charcoal.json
Expand Down Expand Up @@ -1327,6 +1333,7 @@ ced0e7079201c7c8a313a653fff176638b3d9cbb data/forestry/recipes/cocobolo_trapdoor
f57cef1df6d761f2b8477533cc4afbe3da309d52 data/forestry/recipes/cocobolo_wood.json
ee0942ff1feb025f42a64c40aece6d63b5caf385 data/forestry/recipes/compost_ash.json
4f3eb74170b76e0cd98ab11475380bcd08659cfb data/forestry/recipes/compost_wheat.json
319442b2537770f1c5ea83cb7efc9db6dd50e30b data/forestry/recipes/compressed_ice_shards.json
2911138d2eff5398d265b1a1c18c273296856d85 data/forestry/recipes/dark_oak_door.json
b6a553a3782525f3c04a75c0bc64c5763eef5dae data/forestry/recipes/dark_oak_fireproof_fence.json
2ae9d7a59ba84622e4744a11a007deb3240c7e8f data/forestry/recipes/dark_oak_fireproof_fence_gate.json
Expand Down Expand Up @@ -1722,7 +1729,7 @@ e11beb03764aa2abd36d31f018b54be0690cbb2a data/forestry/recipes/hill_cherry_slab.
41459d355960bebbdc1148f9f54fd56a44080044 data/forestry/recipes/hill_cherry_trapdoor.json
dc16151910aa969f6f1d8a640027ac7ca745731f data/forestry/recipes/hill_cherry_wood.json
c17318e981c3ccf69c03d94b68250905ed248e36 data/forestry/recipes/honeyed_slice.json
e0cba493d986a7f303ec96684b9604f18e998ca4 data/forestry/recipes/honey_pot.json
57bf81b60b452c51908dfe8149196c4257367417 data/forestry/recipes/honey_drop_block.json
bbe99b2d167a43e48072060a71b1ff2986427251 data/forestry/recipes/humus_compost.json
8cf80aa4e70b9c180bcc1ff66c483d4a27ed6bb7 data/forestry/recipes/humus_fertilizer.json
11791874e28895e2eba8ef239dfeb9b811d9b691 data/forestry/recipes/hunter_bag.json
Expand Down Expand Up @@ -1987,6 +1994,7 @@ f5aebe6e69f359c9f61582cff05085b1cb85156e data/forestry/recipes/papaya_trapdoor.j
2e6caf8e448cdedc1d45f15e1adacb69ba261784 data/forestry/recipes/peat_bog_managed.json
eb660f95cbb03e5ada885f8c23bedc12b76c05ca data/forestry/recipes/peat_bog_managed_from_manual.json
71ff08e19469fcfad5d943dc8d6bcd8644725d59 data/forestry/recipes/peat_bog_manual.json
03b808791ba5423d54fe9f785292820060c636b0 data/forestry/recipes/phosphor_torches.json
e6561385356e0d8368b4e5d272e0d4b2ecef3f9e data/forestry/recipes/pine_boat.json
c12cb074e6ba7ce85aac8fc43898044afe4a4230 data/forestry/recipes/pine_button.json
b83280983302f87a286d15e77b5c936a90b37ae3 data/forestry/recipes/pine_chest_boat.json
Expand Down Expand Up @@ -2109,11 +2117,13 @@ d5fc1d640eb52329a0c6bccb61f95bd672af802d data/forestry/recipes/squeezer/fruit/da
4ab219e61edec73f8ffeb17eb0affd40ff174e7f data/forestry/recipes/squeezer/fruit/papaya.json
cf3083d4175b604a08e2108551a8658effb241e6 data/forestry/recipes/squeezer/fruit/plum.json
130d357e9b0b0639ab531f85b17fc70c2022127f data/forestry/recipes/squeezer/fruit/walnut.json
1c4b3c30ae642729949b3ad9abb15caaf4596697 data/forestry/recipes/squeezer/honey_block.json
73d37252a85c29137c4167e43a3d40c20299770a data/forestry/recipes/squeezer/honey_dew.json
3062a772a152c33072770a4edac1cef9de1050bd data/forestry/recipes/squeezer/honey_drop.json
f5cb3ea999816727e74b98db7574e32eefcfb901 data/forestry/recipes/squeezer/ice.json
34de695f87abad04c0234b6b6df65d19750bf601 data/forestry/recipes/squeezer/lava.json
0e4b01fa1d9aba2799b002564ffc50421bc78edb data/forestry/recipes/squeezer/lava_sand.json
19ae55f6dadffae0698fe481b6184f3ac94bff6c data/forestry/recipes/squeezer/lava.json
8b962957d67858522a08ffa053ab5fcebb886f95 data/forestry/recipes/squeezer/lava_magma.json
3c3d84bb02eb2c6ac6a7b12867edbd69b332eee2 data/forestry/recipes/squeezer/lava_sand.json
7525b0e9f8720f2209ef261572177829094d2258 data/forestry/recipes/squeezer/mulch.json
a30f9031424bad1eb41afab0f86dc70259636516 data/forestry/recipes/squeezer/seeds.json
ddc5ddb180dc715512339f0e9bbc7f133def1402 data/forestry/recipes/stamp_100n.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.20.1 2025-02-26T20:39:23.3106312 Advancements
// 1.20.1 2025-03-02T13:41:12.0065699 Advancements
d887973001aa97f94b3db364b70304d2f301fd50 data/forestry/advancements/root.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_item": {
"conditions": {
"items": [
{
"items": [
"minecraft:glass_bottle"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "forestry:bottled_honey_drops"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"forestry:bottled_honey_drops"
]
},
"sends_telemetry_event": true
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_item": {
"conditions": {
"items": [
{
"tag": "forge:string"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "forestry:beeswax_candles"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"forestry:beeswax_candles"
]
},
"sends_telemetry_event": true
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_item": {
"conditions": {
"items": [
{
"items": [
"forestry:ice_shard"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "forestry:compressed_ice_shards"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"forestry:compressed_ice_shards"
]
},
"sends_telemetry_event": true
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"has_the_recipe": {
"conditions": {
"recipe": "forestry:honey_pot"
"recipe": "forestry:honey_drop_block"
},
"trigger": "minecraft:recipe_unlocked"
}
Expand All @@ -28,7 +28,7 @@
],
"rewards": {
"recipes": [
"forestry:honey_pot"
"forestry:honey_drop_block"
]
},
"sends_telemetry_event": true
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_item": {
"conditions": {
"items": [
{
"items": [
"forestry:phosphor"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "forestry:phosphor_torches"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"forestry:phosphor_torches"
]
},
"sends_telemetry_event": true
}
20 changes: 20 additions & 0 deletions src/generated/resources/data/forestry/recipes/beeswax_candles.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"^": {
"item": "forestry:beeswax"
},
"|": {
"tag": "forge:string"
}
},
"pattern": [
" | ",
" ^ "
],
"result": {
"item": "minecraft:candle"
},
"show_notification": true
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"type": "minecraft:crafting_shapeless",
"category": "misc",
"ingredients": [
{
"item": "minecraft:glass_bottle"
},
{
"item": "forestry:honey_drop"
},
{
"item": "forestry:honey_drop"
}
],
"result": {
"item": "minecraft:honey_bottle"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@
}
},
"pattern": [
"XXX",
"XXX",
"XXX"
"XX",
"XX"
],
"result": {
"item": "forestry:woven_silk"
Expand Down
Loading