-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feature: mercurial logistics networks (#180)
* fix: selection messages in SP do not work * feat: poc node graph * chore: add todo * feat: [ImgBot] Optimize images (#165) * feat: work on t1 logistics connector * feat: add BE * feat: start wire rendering * feat wire render experiments * fix: direction of tautness/rope bend * fix: wire offset * feat: make wire item consume and reset nbt * feat: new wire calculation * chore: switch to quadratic formula * chore: add todos * feat: use fishing hook renderer * feat: add simulated hanging * chore: prep copyright * feat: initial (a bit broken) parabolic rendering * feat: set up working basic wire rendering with tautness/sag * chore: clean up renderer * feat: move wire connector to center of block * chore: remove outdated comment * chore: refactor * chore: simplify wire management * fix: access to variable * feat: start working on wire sync per chunk * chore: delete unused * fix: save data id * feat: work on sync * fix: wire rendering accidentally used to as from * feat: allow retrieval of wire by start/end point * feat: add wire removal * fix: message accessing client level via mc instance * feat: refactor logistics and add graph serialization * feat: add some leaf node types * feat: work on logistics network * feat: switched logistics to globalpos * chore: refactor behaviour folders * chore: refactor into behaviour (not complete yet) * feat: work on frequency change * feat: cleanup system * feat: add cache rebuild * feat: improve network building - on load - on leaf node add * feat: leaf node removal and capability invalidate handling * feat: removal from network + network split * chore: reorder members * feat: add capability aware leaf node getter * chore: import cleanup * chore: now use capability aware leaf node getter * feat: work on connectors * feat: nbt handling & target selection * chore: generate data * feat: add reuse headers * fix: add missing blockstate gen * feat: improve node add/remove logic * feat: better cap invalidation listening * feat: chunk load handling and better chunk unload handling * fix: wire removal issues with multiple wires * chore: simplify id * feat: work on item transfer * feat: add set dirty to logistics * fix: extraction/insertion * chore: add todos * feat: introduce extraction rate * feat: start working on block highlights * chore: tests with highlight * chore: auto reformat * feat: add (nonfunctional) configuration wand item * feat: add initial hud for item * chore: add missing reuse info * feat: add initial mode changing functionality * feat: work on mode items * feat: proper face selection via sub-scroll handling * feat: text and additional mode * feat: delegate use handling to the mode * feat: start adding functionality to the direction setter mode * feat: add some wand interaction to nodes * feat: improve stuff * feat: add success feedback and setup render handling basics * fix: mode direction scrolling is not persistent * feat: add new icons * feat: add switch enabled mode * fix: divination rod and mercurial wand not rendering in right perspective * feat: update capability caches on extractor/inserter direction change * fix: prevent client side modification of leaf node status * feat: work on improving set direction mode * feat: rundata for modonomicon change * feat: add more context to wand mode * feat: update tooltips * feat: move highlight rendering into mode render handler * feat: add in world rendering to set direction mode * chore: reuse compliance * feat: make slow ticks shift randomly per connector This avoids all connectors working on the same tick * feat: work on finalized node * fix: collider for connector * fix: connector z-fighting with chests * feat: different textures for inserter and extractor * feat: better model transforms for logistics block items * fix: use z-fighting fix that does not affect UVs * chore: move directional shape calculation in separate class * fix: sal ammoniac accumulator tooltip claims you need a brazier below * feat: add rotate selected direction mode at the same time disable "select" and "set" direction modes, * feat: networkify logistics status visualization * feat: implement connection node * fix: prevent crash when trying to remove a graph node that was never added * chore: jade prep * feat: allow wires to drop on destroy of connected block * feat: make logistics blocks drop if their target is destroyed * feat: wire range * chore: remove implemented todos * feat: add recipe for wire * feat: add recipes for tools and apparatus also: add recipe category -> it is ignored by neo currently, but maybe in the future it can help to reduce spam * feat: start guide on logistics * feat: more logistics guide content * feat: more logistics guide content * feat; make buildRecipes public on JsonRecipeProvider * feat: more logistics guide content * chore: re-establish reuse compliance --------- Co-authored-by: imgbot[bot] <31301654+imgbot[bot]@users.noreply.github.com>
- Loading branch information
1 parent
6be3fd0
commit c52b48e
Showing
626 changed files
with
8,943 additions
and
631 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 16 additions & 16 deletions
32
src/generated/resources/.cache/444362c84684b9346bb4ad16fb33ed185ef17ccc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,16 @@ | ||
// 1.20.4 2024-01-17T16:43:37.1608791 Calcination Recipes | ||
1ab868373c59c0179ba18c2b629bc3766d9857de data/theurgy/recipes/calcination/crops.json | ||
15b0bc231284fa27e47c3bb3108c2f6218748e21 data/theurgy/recipes/calcination/mineral.json | ||
8adcc3b4d5a73b1cf38a8e629583003d6474194d data/theurgy/recipes/calcination/mineral_from_gems.json | ||
6fc7816baf3b28de2306dff442c9098585bbcbb2 data/theurgy/recipes/calcination/mineral_from_ingots.json | ||
2849dc9c50f65dcb17818f14a231e73b492a3d9b data/theurgy/recipes/calcination/mineral_from_ores.json | ||
065a0ddeeea4b53e3967302f1a99a262951f3700 data/theurgy/recipes/calcination/mineral_from_other_minerals.json | ||
6dc5fde49b7c755176890d7c0eea01f4865726e3 data/theurgy/recipes/calcination/mineral_from_raw_materials.json | ||
aa1410bfe3153eb4771c826d60a2bedf12321fb9 data/theurgy/recipes/calcination/strata_from_clay.json | ||
52fa2c468144c8663fdb758092a92e9087686ce5 data/theurgy/recipes/calcination/strata_from_clay_ball.json | ||
8ba80f78a2fe582084f130ce8979d2583ea49fbf data/theurgy/recipes/calcination/strata_from_cobblestone.json | ||
d751dedd16dd885d13cb0105b6adef5e6e0d1c38 data/theurgy/recipes/calcination/strata_from_dirt.json | ||
f1003cfb6b2baa186452fb7f96c40417650f4951 data/theurgy/recipes/calcination/strata_from_gravel.json | ||
fbabb73eb03e7b0dba51f405685628a44f1b85f7 data/theurgy/recipes/calcination/strata_from_sand.json | ||
4a1c1555c53341e1b7927bf0a34bed2f0793a7cb data/theurgy/recipes/calcination/strata_from_sandstone.json | ||
fa3bf7b443e9d80e94fa69ab0e255cc1704ce79d data/theurgy/recipes/calcination/strata_from_stone.json | ||
// 1.20.4 2024-05-25T13:38:47.7936853 Calcination Recipes | ||
bf2f7ab6aa2aad16c35ef79bdc255fe4b6ff4404 data/theurgy/recipes/calcination/crops.json | ||
39c1b59033b2f9587873bb53bcf47dd7de5c8cfc data/theurgy/recipes/calcination/mineral.json | ||
ec3ffca30544465cb45de3dfb37424586832668a data/theurgy/recipes/calcination/mineral_from_gems.json | ||
d34c225c052338b1501bcbd21e043231ac44f7f7 data/theurgy/recipes/calcination/mineral_from_ingots.json | ||
b07344a18bbda6b38d70991a97148a255dbb7a18 data/theurgy/recipes/calcination/mineral_from_ores.json | ||
5d47d2529cb79f3f62fa2159fccce5f0c28f1d4f data/theurgy/recipes/calcination/mineral_from_other_minerals.json | ||
51f6237a8c17977cd15997e803a4e978e8d1d036 data/theurgy/recipes/calcination/mineral_from_raw_materials.json | ||
a82594b79405cbc12e26262c3d5fe18130d61e68 data/theurgy/recipes/calcination/strata_from_clay.json | ||
2afba9157ca93d0be647a5b26053d198d40601e5 data/theurgy/recipes/calcination/strata_from_clay_ball.json | ||
0e62f8e438f8a1fa1fa48a6187fa8c484c00aeaa data/theurgy/recipes/calcination/strata_from_cobblestone.json | ||
43616593ea63d7084241129deb36a3c73db08ce4 data/theurgy/recipes/calcination/strata_from_dirt.json | ||
21d88699cbff100e85eb3d4e6cdc7c8c45c81fa4 data/theurgy/recipes/calcination/strata_from_gravel.json | ||
e1f604548adf81e5ab8edeff92d309bfcce31a06 data/theurgy/recipes/calcination/strata_from_sand.json | ||
f69c12741f0e9caf5a708d900f83df39d04d8802 data/theurgy/recipes/calcination/strata_from_sandstone.json | ||
ba46b01764d94e57c7a7973da74e4cd57679fad1 data/theurgy/recipes/calcination/strata_from_stone.json |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 5 additions & 3 deletions
8
src/generated/resources/.cache/93765a0f723bc6097e750f2a441254a1f7b8ae08
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,5 @@ | ||
// 1.20.4 2024-01-16T15:38:38.1742182 Shapeless Crafting Recipes | ||
cc984ff1635bde6101fa84b2261798fe4af68557 data/theurgy/recipes/crafting/shapeless/sal_ammoniac_crystal_from_sal_ammoniac_bucket.json | ||
bd9adbc64c1dad493a909a3f4b90ac016757432c data/theurgy/recipes/crafting/shapeless/the_hermetica.json | ||
// 1.20.4 2024-05-25T13:38:47.7947444 Shapeless Crafting Recipes | ||
6017c308729d12b68a43e016207b272ce0b636a4 data/theurgy/recipes/crafting/shapeless/logistics_item_extractor_from_inserter.json | ||
4a7e21b89d8e40928e19abe740839aaadd000921 data/theurgy/recipes/crafting/shapeless/logistics_item_inserter_from_extractor.json | ||
2eabb44670401c8fd0b1ca254b9893de14f6b125 data/theurgy/recipes/crafting/shapeless/sal_ammoniac_crystal_from_sal_ammoniac_bucket.json | ||
3fb7309b9ae4030f1a88b5a888a01be4a292e6cf data/theurgy/recipes/crafting/shapeless/the_hermetica.json |
63 changes: 34 additions & 29 deletions
63
src/generated/resources/.cache/96e1c194aa2b8cdd63adb750d34ba507337ea835
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,29 +1,34 @@ | ||
// 1.20.4 2024-01-16T15:45:43.5179659 Shaped Crafting Recipes | ||
10616b9ecf4903d076f75f2b754a415125413d44 data/theurgy/recipes/crafting/shaped/amethyst_divination_rod.json | ||
10238f21b147011c777703fc0ade32f5708fd6ad data/theurgy/recipes/crafting/shaped/calcination_oven.json | ||
e31f43d1025bbbbe3ab7dbc9892e44cba7fdc0ab data/theurgy/recipes/crafting/shaped/caloric_flux_emitter_from_campfire.json | ||
8f4a534c43c54d9602ff500158424e43f9534d9e data/theurgy/recipes/crafting/shaped/caloric_flux_emitter_from_lava_bucket.json | ||
ce6aa89549dd24c24159b9134951aeb7f31c62dc data/theurgy/recipes/crafting/shaped/digestion_vat.json | ||
072f07fe72f4d544af641d052c894b0dfcb5a1b1 data/theurgy/recipes/crafting/shaped/distiller.json | ||
23cc9ffeb1383e5fead6a158948b62eb5b3a2f97 data/theurgy/recipes/crafting/shaped/divination_rod_t1.json | ||
b147e20c9fc286b8571f45aebd2cc845d12b80bd data/theurgy/recipes/crafting/shaped/divination_rod_t2.json | ||
daad93aefa89912ae4a624f64b96e6106f5b32ed data/theurgy/recipes/crafting/shaped/divination_rod_t3.json | ||
3f469caf98fa40c1dd36a6d73485cb32db5915b4 data/theurgy/recipes/crafting/shaped/divination_rod_t4.json | ||
88c38cdce02224a470773430ba59d370847a9b5d data/theurgy/recipes/crafting/shaped/fermentation_vat.json | ||
8141e9f1a1eccfcb5b4c476751830b2600a2cd80 data/theurgy/recipes/crafting/shaped/incubator.json | ||
99dffd10149edf29f4e38f3714b7182906c069f4 data/theurgy/recipes/crafting/shaped/incubator_mercury_vessel.json | ||
55f6a8722640f08990360138a09768da6da1a072 data/theurgy/recipes/crafting/shaped/incubator_salt_vessel.json | ||
f2f5b3c943abc56b299522e13e48d9dd45cc608f data/theurgy/recipes/crafting/shaped/incubator_sulfur_vessel.json | ||
07f4c6dc7399b08687ef579a23091daaaeb481f7 data/theurgy/recipes/crafting/shaped/liquefaction_cauldron.json | ||
fcb5ee591de6878bb39c43b57dc8357c2e8eff09 data/theurgy/recipes/crafting/shaped/mercury_catalyst.json | ||
3c4bb4a4dd344b7d4cf2117d22125b0f47492423 data/theurgy/recipes/crafting/shaped/pyromantic_brazier.json | ||
f96af8d81404ab21a77a0e3ce5aa9bf966e7ee5d data/theurgy/recipes/crafting/shaped/reformation_result_pedestal.json | ||
70c0e2db5e175d83a46382786612fc13a71bc635 data/theurgy/recipes/crafting/shaped/reformation_source_pedestal.json | ||
ed951a3a8f9d5188c399ebb428f029a73470c87b data/theurgy/recipes/crafting/shaped/reformation_target_pedestal.json | ||
d936646ef1c9e9a146bf63b3676cc3e338c4f253 data/theurgy/recipes/crafting/shaped/sal_ammoniac_accumulator.json | ||
a29b1881ae565d790b09ee568780627b7854e0fe data/theurgy/recipes/crafting/shaped/sal_ammoniac_tank.json | ||
f4812283601b1a4ecb2429835e9be2d50a8a4a45 data/theurgy/recipes/crafting/shaped/sulfuric_flux_emitter.json | ||
447b0ae8e48b94342498e573e74f31835a60a98f data/theurgy/recipes/crafting/shaped/sulfur_attuned_divination_rod_abundant.json | ||
6300e5cdd6946b5b3c4e9b746ffe89201eb8e76b data/theurgy/recipes/crafting/shaped/sulfur_attuned_divination_rod_common.json | ||
d3b87c7161f73e481604a2948dff55ec783e4b97 data/theurgy/recipes/crafting/shaped/sulfur_attuned_divination_rod_precious.json | ||
c63d699e861a6a5a1f98b30783c4c62967e54e00 data/theurgy/recipes/crafting/shaped/sulfur_attuned_divination_rod_rare.json | ||
// 1.20.4 2024-05-25T13:59:30.5808876 Shaped Crafting Recipes | ||
65adf9745631d64def2dcad201ebfd627f7d1f54 data/theurgy/recipes/crafting/shaped/amethyst_divination_rod.json | ||
beeb9dcc0af3fee3db11bae63a00ca0b0847e81a data/theurgy/recipes/crafting/shaped/calcination_oven.json | ||
de70910187e1db700fcbb06e774170b0f54186a5 data/theurgy/recipes/crafting/shaped/caloric_flux_emitter_from_campfire.json | ||
f10b63402d9565c5536fad68c998a2c460e7bb80 data/theurgy/recipes/crafting/shaped/caloric_flux_emitter_from_lava_bucket.json | ||
37f3353bf6ff86f8ee64ab3af30ce9bf1f21ce07 data/theurgy/recipes/crafting/shaped/copper_wire.json | ||
655b9cf0ee6a23fb553a6894bd0554d303e4d00a data/theurgy/recipes/crafting/shaped/digestion_vat.json | ||
415d5f0ecad980e5f54c1852974e6736dd9fa1bb data/theurgy/recipes/crafting/shaped/distiller.json | ||
921cefdf1ac2f487f4784dab35990864a49ab98a data/theurgy/recipes/crafting/shaped/divination_rod_t1.json | ||
6c010e0f6410098e65f5f9d2443563be9eac4364 data/theurgy/recipes/crafting/shaped/divination_rod_t2.json | ||
c37acacfce0d45724c3551d06c3f4dfd58d67132 data/theurgy/recipes/crafting/shaped/divination_rod_t3.json | ||
b35dcc656b28f8561a6fbd117de588377ab8a317 data/theurgy/recipes/crafting/shaped/divination_rod_t4.json | ||
6a149cb61c6b59590ab5472946eef4b6feca1568 data/theurgy/recipes/crafting/shaped/fermentation_vat.json | ||
e7f45eb1b7b9b57582cdfa98b50046a2d4d3861c data/theurgy/recipes/crafting/shaped/incubator.json | ||
12bcfeb8ae4e8ad04f8c7dc5617d8851f3397c09 data/theurgy/recipes/crafting/shaped/incubator_mercury_vessel.json | ||
2a5b69ce0e29618a636e589834986eccce956a29 data/theurgy/recipes/crafting/shaped/incubator_salt_vessel.json | ||
e99098bfd0887c4f43cb99dde1452b606d8e8d3d data/theurgy/recipes/crafting/shaped/incubator_sulfur_vessel.json | ||
75819834a8823a42874b5b66d0ecf3eb9e235adc data/theurgy/recipes/crafting/shaped/liquefaction_cauldron.json | ||
6b8bedd96a9311601374e6b8a56acdd1b38a4394 data/theurgy/recipes/crafting/shaped/logistics_connector_node.json | ||
2455fc2a33a54b406575f477be589563688c5a77 data/theurgy/recipes/crafting/shaped/logistics_item_extractor.json | ||
19fe7c9dda2cceeadf7b79d8b1c7e63c291731e5 data/theurgy/recipes/crafting/shaped/logistics_item_inserter.json | ||
6fadba46429947db8e894b1f63afb0e1ef1d4693 data/theurgy/recipes/crafting/shaped/mercurial_wand.json | ||
85b82930854b94e946bd26c03e4590ca3bb199af data/theurgy/recipes/crafting/shaped/mercury_catalyst.json | ||
7d2334397096083e881438fcc2bca336cbba7787 data/theurgy/recipes/crafting/shaped/pyromantic_brazier.json | ||
dfa144c70999a57909f839b09624652ffd753460 data/theurgy/recipes/crafting/shaped/reformation_result_pedestal.json | ||
77b224370e76cd59d99c679a7d2e127464283a6b data/theurgy/recipes/crafting/shaped/reformation_source_pedestal.json | ||
ef3262cd7439a728f39dc1d012f8a34c4e41abd0 data/theurgy/recipes/crafting/shaped/reformation_target_pedestal.json | ||
841fd592bc9dd4af552c2bb503cff80d1cd0f4d1 data/theurgy/recipes/crafting/shaped/sal_ammoniac_accumulator.json | ||
057dbdb4e2e532cfdbacad922a3bf880f12d51bf data/theurgy/recipes/crafting/shaped/sal_ammoniac_tank.json | ||
6a8f9bf88bb463844f869ba9e848eac73a2691a1 data/theurgy/recipes/crafting/shaped/sulfuric_flux_emitter.json | ||
2b69863e1a4ea19a7bececf9bc205f6b01b2a877 data/theurgy/recipes/crafting/shaped/sulfur_attuned_divination_rod_abundant.json | ||
bccf3fd33fa05e1ddf8d1883651a0b427c8877ef data/theurgy/recipes/crafting/shaped/sulfur_attuned_divination_rod_common.json | ||
6780b34b1f3fa7a6d95ffb7ae21f6db09b53afe6 data/theurgy/recipes/crafting/shaped/sulfur_attuned_divination_rod_precious.json | ||
86f714ec9bd46bbbe6954126ae3ce577b89bff34 data/theurgy/recipes/crafting/shaped/sulfur_attuned_divination_rod_rare.json |
Oops, something went wrong.