Rework Multiblock Abilities #2420
Open
Conversation
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
ghzdude
force-pushed
the
gh-mutli-abilities
branch
from
0c22cbd to
6b8c11a
Compare
ghzdude
force-pushed
the
gh-mutli-abilities
branch
2 times, most recently
from
b58ef1c to
f6b840f
Compare
ghzdude
force-pushed
the
gh-mutli-abilities
branch
from
6bdc2d7 to
6d0fcf2
Compare
ghzdude
force-pushed
the
gh-mutli-abilities
branch
from
6d0fcf2 to
dff15e9
Compare
ghzdude
force-pushed
the
gh-mutli-abilities
branch
from
829ea5f to
04ad422
Compare
serenibyss
reviewed
Jul 10, 2024
src/main/java/gregtech/api/capability/impl/MultiblockRecipeLogic.java
Outdated
Show resolved
Hide resolved
Comment on lines
352
to
370
| for (IMultiblockPart multiblockPart : parts) { | ||
| if (multiblockPart instanceof IMultiblockAbilityPart) { | ||
| @SuppressWarnings("unchecked") | ||
| IMultiblockAbilityPart<Object> abilityPart = (IMultiblockAbilityPart<Object>) multiblockPart; | ||
| List<Object> abilityInstancesList = abilities.computeIfAbsent(abilityPart.getAbility(), | ||
| k -> new ArrayList<>()); | ||
| abilityPart.registerAbilities(abilityInstancesList); | ||
| for (IMultiblockPart part : parts) { | ||
| if (part instanceof IMultiblockAbilityPart abilityPart) { | ||
| List<MultiblockAbility> abilityList = abilityPart.getAbilities(); | ||
| for (MultiblockAbility ability : abilityList) { | ||
| List abilityInstancesList = abilities.computeIfAbsent(ability, | ||
| k -> new ArrayList<>()); | ||
| abilityInstancesList.addAll(abilityPart.registerAbilities(ability)); | ||
| } |
There was a problem hiding this comment.
What happens here if a single multiblock part has IMPORT_ITEMS and IMPORT_FLUIDS, but the multiblock only allows one of these in the structure at that position. Should the part be allowed or rejected?
There was a problem hiding this comment.
I added a method that skips adding abilities at certain positions, but should i just invalidate the multiblock instead?
ghzdude
force-pushed
the
gh-mutli-abilities
branch
from
3700d34 to
bfd2e2f
Compare
ghzdude
force-pushed
the
gh-mutli-abilities
branch
from
fd8136b to
4ac4934
Compare
TechLord22
reviewed
Aug 2, 2024
src/main/java/gregtech/api/capability/impl/MultiblockRecipeLogic.java
Outdated
Show resolved
Hide resolved
src/main/java/gregtech/api/metatileentity/multiblock/MultiblockAbility.java
Outdated
Show resolved
Hide resolved
ghzdude
force-pushed
the
gh-mutli-abilities
branch
from
ce00ff9 to
734585c
Compare
spotless
missed spot for checking fluids in mrl
remove warn
some javadocs
spotless
…nstead of sealed class casually rework DualEntry to not be an item handler
fix distinct fluids
ghzdude
force-pushed
the
gh-mutli-abilities
branch
from
7e565d2 to
73bc303
Compare
spotless
clarify existing check at set use simple name instead of class string
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What
Reworks
IMultiblockAbilityPartto allow for multiple abilities from one part.MultiblockRecipeLogicchecks if an item handler could also be a fluid handler (only for distinct mode atm)Implements a ghost circuit slot for single-tank fluid input hatches.
Implementation Details
add a class to
MultiblockAbility's constructor so that class types can be checkedadd a new class to store instances of a
MultilbockAbility. types are checked and an exception is thrown when the wrong type is added.a new class,
DualHandler, is added to implement item and fluid handling capabilities. (not used for anything atm)Should multitank fluid hatches (quad/nonuple) have ghost circuits as well?
Outcome
fluid hatches are more spooky