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

Release v2.0.0-milestone.3.3 #475

Merged
merged 37 commits into from
Feb 17, 2024
Merged

Release v2.0.0-milestone.3.3 #475

merged 37 commits into from
Feb 17, 2024

Conversation

raoulvdberge
Copy link
Contributor

Hi @raoulvdberge!
This PR was created in response to a manual trigger of the release workflow here: https://github.com/refinedmods/refinedstorage2/actions/runs/7944946052.
Merging this PR will publish the release.

Merge main into develop branch
We want to only have 1 base disk model. The leds of the disk (in this case, "inactive") should be
rendered independently if we easily want to allow for extra disk models.

This also separates the disk model from the disk drive in the asset folder hierarchy.
So that we know which disk is in the inventory, for custom disk rendering purposes.
We will need it for the portable grid soon, which is not a mulistorage.
refactor: decouple storage state from multistorage
Block, recipe and models.
Generifies disk inventory and extracts the internal multistorage as a "StateTrackedStorage".
The storage channel type component of the internal multistorage has been moved into TypedStorage, as
it's not necessary for the portable grid or StateTrackedStorage.
Refactors energy info packets and syncing so we can reuse.
Don't force people to use our own extended menu provider.
…etwork merge

The grid would only sync resources that were part of the (removed) slave network after a network
merge because the storages from the master network just "remain" and don't get removed and re-added.

In 1d4d3ae an initial fix was made to ensure correct behavior for network splits, by making the
grid highest-priority and relying on the moved storages re-adding themselves afterwards.

However, for network merges, it would
completely ignore storages that were already part of the new network as those remain
and don't get re-added.

If the storages from the new network remain and don't get re-added, we need to notify the grid of
these storages somehow (by re-syncing).

This change adds the re-syncing (replay) necessary for network merges.
For network splits, it will still re-sync (replay) but won't actually do anything as the network is
newly-created and empty at that point.
fix: grid not retrieving resources from the new master network in a network merge
Generalizes grid watcher registration management code.
…eractions

feat: portable grid interactions
@raoulvdberge raoulvdberge merged commit 61eaab4 into main Feb 17, 2024
6 checks passed
@raoulvdberge raoulvdberge deleted the release/2.0.0-milestone.3.3 branch February 17, 2024 23:37
Copy link

Quality Gate Passed Quality Gate passed

Issues
0 New issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 19, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant