Graph-related fixes #922

Open

Rover656 wants to merge 4 commits from chore/graph-fixes into dev/1.21.1

Rover656 commented

2024-12-13 12:41:56 +00:00

(Migrated from github.com)

Description

Fixes:

Energy conduit duplication (#920)
Capacitor bank backend rewrite to remove the interaction overhead (#704)
Capacitor bank TPS hit when idle (#905)

The idle TPS hit was due to our network syncing, while these changes mitigate the impact to a reasonable point, our networking solution still needs some love. I'll begin work on something that will fix these problems.

TODO

Finalise and have merged the GraphLib changes (https://github.com/gigaherz/GraphLib/pull/8)
Apply these changes to the solar panels
Re-add IO monitor data to cap. banks
Fix performance hit due to networking when feeding into a large cap bank (solar -> 15x15x15 cap bank)

Breaking Changes

No breaking changes, pre-existing cap banks and solar panels will keep their stored energy.

Checklist

My code follows the style guidelines of this project (.editorconfig, most IDEs will use this for you).
I have made corresponding changes to the documentation.
My changes are ready for review from a contributor.

# Description Fixes: * Energy conduit duplication (#920) * Capacitor bank backend rewrite to remove the interaction overhead (#704) * Capacitor bank TPS hit when idle (#905) The idle TPS hit was due to our network syncing, while these changes mitigate the impact to a _reasonable_ point, our networking solution still needs some love. I'll begin work on something that will fix these problems.  # TODO - [ ] Finalise and have merged the GraphLib changes (https://github.com/gigaherz/GraphLib/pull/8) - [ ] Apply these changes to the solar panels - [ ] Re-add IO monitor data to cap. banks - [ ] Fix performance hit due to networking when feeding into a large cap bank (solar -> 15x15x15 cap bank) # Breaking Changes No breaking changes, pre-existing cap banks and solar panels will keep their stored energy.  # Checklist - [ ] My code follows the style guidelines of this project (.editorconfig, most IDEs will use this for you). - [ ] I have made corresponding changes to the documentation. - [ ] My changes are ready for review from a contributor.

This pull request has changes conflicting with the target branch.

buildSrc/shared.gradle.kts
enderio-conduits/src/main/java/com/enderio/conduits/api/ConduitNetworkContext.java
enderio-conduits/src/main/java/com/enderio/conduits/common/conduit/ConduitGraphContext.java
enderio-conduits/src/main/java/com/enderio/conduits/common/conduit/type/energy/EnergyConduitNetworkContext.java
enderio-machines/src/main/java/com/enderio/machines/common/blockentity/solar/SolarPanelBlockEntity.java
enderio/src/main/java/com/enderio/enderio/content/machines/capacitor_bank/CapacitorBankBlockEntity.java
gradle.properties

View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin chore/graph-fixes:chore/graph-fixes

git switch chore/graph-fixes

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch dev/1.21.1

git merge --no-ff chore/graph-fixes

git switch chore/graph-fixes

git rebase dev/1.21.1

git switch dev/1.21.1

git merge --ff-only chore/graph-fixes

git switch chore/graph-fixes

git rebase dev/1.21.1

git switch dev/1.21.1

git merge --no-ff chore/graph-fixes

git switch dev/1.21.1

git merge --squash chore/graph-fixes