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

Implement fluid covers #272

Merged
merged 31 commits into from
Aug 12, 2023
Merged

Implement fluid covers #272

merged 31 commits into from
Aug 12, 2023

Conversation

mikerooni
Copy link
Member

@mikerooni mikerooni commented Aug 4, 2023

  • Fixes and refactoring for item filters and PumpCover
  • Fix ZPM and UV tiers for covers (was previously capped at LuV)
  • Fluid Regulator
  • Fluid Voiding Covers

The pump cover now uses millibuckets in all its variables and all
conversions from or to the necessary unit to be either displayed or used
are done in-place.
This is the first half of the fix. The second half will be separating
the change callback from item stack updating.
Separate persisting filters from onUpdate callback & automatically apply
stack size config in robot arm.
@mikerooni mikerooni marked this pull request as ready for review August 9, 2023 01:12
@mikerooni mikerooni requested a review from a team as a code owner August 9, 2023 01:12
@mikerooni mikerooni added the Do Not Merge DO NOT MERGE THIS PR YET! label Aug 9, 2023
@mikerooni
Copy link
Member Author

mikerooni commented Aug 9, 2023

This still depends on Low-Drag-MC/LDLib-Architectury/pull/7 to be merged and the ldlib version being bumped here.
It will not compile otherwise.

Done.

@mikerooni mikerooni mentioned this pull request Aug 9, 2023
25 tasks
@mikerooni mikerooni removed the Do Not Merge DO NOT MERGE THIS PR YET! label Aug 9, 2023
@mikerooni mikerooni marked this pull request as draft August 9, 2023 10:50
@mikerooni mikerooni marked this pull request as ready for review August 9, 2023 14:19
@mikerooni
Copy link
Member Author

In case it helps with reviewing - this PR has 3 blocks that can be seen as one logical "unit" each:

@Yefancy Yefancy merged commit 434b442 into GregTechCEu:1.19.2 Aug 12, 2023
Yefancy pushed a commit that referenced this pull request Aug 12, 2023
* refactor: extract enum selection to EnumSelectorWidget

* refactor: cleanup PumpCover

* fix: leveling issues on covers

* refactor: rework pump cover logic

The pump cover now uses millibuckets in all its variables and all
conversions from or to the necessary unit to be either displayed or used
are done in-place.

* fix: use correct covers for ZPM and UV tiers

* style: reformat multi tier covers in GTItems

* fix: correctly apply stack size on item filters in robot arms (part 1)

This is the first half of the fix. The second half will be separating
the change callback from item stack updating.

* feat: add fluid regulator cover

* fix: correctly apply stack size on item filters in robot arms (part 2)

Separate persisting filters from onUpdate callback & automatically apply
stack size config in robot arm.

* fix: errors on loading fluid filter

* fix: filter ui not updating when removing filter

* feat: fluid filter stack size & fluid regulator GUI

* refactor: PumpCover visibility & cleanup

* feat: TRANSFER_EXACT mode for fluid regulator cover

* fix: correct initial transfer per second for pump cover

* chore: update IFluidTransfer implementations for next LDLib version

* feat: KEEP_EXACT mode for fluid regulator cover

* chore: update LDLib to 1.0.17

* fix: stack/transfer size input visibility in fluid regulator & robot arm

* fix: cases where supply amount > max transfer left in fluid regulator

* refactor: cleanup item voiding covers

* fix: UI title on item voiding cover

* fix: stack size input visibility in advanced item voiding cover

* feat: fluid voiding covers (UI only)

* refactor: move enumerateDistinctFluids() to PumpCover

* feat: implement logic for fluid voiding covers

* refactor: move platform specific fluid calculation out of BucketMode
lukaslcf pushed a commit to lukaslcf/GregTechCEu-1.19 that referenced this pull request Aug 25, 2023
* refactor: extract enum selection to EnumSelectorWidget

* refactor: cleanup PumpCover

* fix: leveling issues on covers

* refactor: rework pump cover logic

The pump cover now uses millibuckets in all its variables and all
conversions from or to the necessary unit to be either displayed or used
are done in-place.

* fix: use correct covers for ZPM and UV tiers

* style: reformat multi tier covers in GTItems

* fix: correctly apply stack size on item filters in robot arms (part 1)

This is the first half of the fix. The second half will be separating
the change callback from item stack updating.

* feat: add fluid regulator cover

* fix: correctly apply stack size on item filters in robot arms (part 2)

Separate persisting filters from onUpdate callback & automatically apply
stack size config in robot arm.

* fix: errors on loading fluid filter

* fix: filter ui not updating when removing filter

* feat: fluid filter stack size & fluid regulator GUI

* refactor: PumpCover visibility & cleanup

* feat: TRANSFER_EXACT mode for fluid regulator cover

* fix: correct initial transfer per second for pump cover

* chore: update IFluidTransfer implementations for next LDLib version

* feat: KEEP_EXACT mode for fluid regulator cover

* chore: update LDLib to 1.0.17

* fix: stack/transfer size input visibility in fluid regulator & robot arm

* fix: cases where supply amount > max transfer left in fluid regulator

* refactor: cleanup item voiding covers

* fix: UI title on item voiding cover

* fix: stack size input visibility in advanced item voiding cover

* feat: fluid voiding covers (UI only)

* refactor: move enumerateDistinctFluids() to PumpCover

* feat: implement logic for fluid voiding covers

* refactor: move platform specific fluid calculation out of BucketMode
screret added a commit that referenced this pull request Nov 23, 2023
* refactor: extract enum selection to EnumSelectorWidget

* refactor: cleanup PumpCover

* fix: leveling issues on covers

* refactor: rework pump cover logic

The pump cover now uses millibuckets in all its variables and all
conversions from or to the necessary unit to be either displayed or used
are done in-place.

* fix: use correct covers for ZPM and UV tiers

* style: reformat multi tier covers in GTItems

* fix: correctly apply stack size on item filters in robot arms (part 1)

This is the first half of the fix. The second half will be separating
the change callback from item stack updating.

* feat: add fluid regulator cover

* fix: correctly apply stack size on item filters in robot arms (part 2)

Separate persisting filters from onUpdate callback & automatically apply
stack size config in robot arm.

* fix: errors on loading fluid filter

* fix: filter ui not updating when removing filter

* feat: fluid filter stack size & fluid regulator GUI

* refactor: PumpCover visibility & cleanup

* feat: TRANSFER_EXACT mode for fluid regulator cover

* fix: correct initial transfer per second for pump cover

* chore: update IFluidTransfer implementations for next LDLib version

* feat: KEEP_EXACT mode for fluid regulator cover

* chore: update LDLib to 1.0.17

* fix: stack/transfer size input visibility in fluid regulator & robot arm

* fix: cases where supply amount > max transfer left in fluid regulator

* refactor: cleanup item voiding covers

* fix: UI title on item voiding cover

* fix: stack size input visibility in advanced item voiding cover

* feat: fluid voiding covers (UI only)

* refactor: move enumerateDistinctFluids() to PumpCover

* feat: implement logic for fluid voiding covers

* refactor: move platform specific fluid calculation out of BucketMode
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants