-
-
Notifications
You must be signed in to change notification settings - Fork 537
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
Add support for chemicals as camos on framed blocks #8209
Merged
pupnewfster
merged 4 commits into
mekanism:1.21.x
from
XFactHD:framedblocks_chemical_camo
Aug 22, 2024
Merged
Add support for chemicals as camos on framed blocks #8209
pupnewfster
merged 4 commits into
mekanism:1.21.x
from
XFactHD:framedblocks_chemical_camo
Aug 22, 2024
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
src/main/java/mekanism/common/integration/framedblocks/ChemicalSpriteParticle.java
Fixed
Show resolved
Hide resolved
pupnewfster
requested changes
Aug 21, 2024
src/main/java/mekanism/common/integration/framedblocks/ChemicalCamoContent.java
Outdated
Show resolved
Hide resolved
src/main/java/mekanism/common/integration/framedblocks/ChemicalCamoContent.java
Outdated
Show resolved
Hide resolved
src/main/java/mekanism/common/integration/framedblocks/FramedBlocksIntegration.java
Outdated
Show resolved
Hide resolved
src/main/java/mekanism/common/integration/framedblocks/FramedBlocksIntegration.java
Outdated
Show resolved
Hide resolved
src/main/java/mekanism/common/integration/framedblocks/ChemicalSpriteParticle.java
Fixed
Show resolved
Hide resolved
src/main/java/mekanism/common/integration/framedblocks/ChemicalSpriteParticle.java
Outdated
Show resolved
Hide resolved
src/main/java/mekanism/common/integration/framedblocks/ChemicalCamoContainerFactory.java
Outdated
Show resolved
Hide resolved
src/main/java/mekanism/common/integration/framedblocks/ChemicalCamoContainerFactory.java
Outdated
Show resolved
Hide resolved
src/main/java/mekanism/common/integration/framedblocks/ChemicalCamoContainerFactory.java
Outdated
Show resolved
Hide resolved
src/main/java/mekanism/common/integration/framedblocks/ChemicalModel.java
Outdated
Show resolved
Hide resolved
pupnewfster
reviewed
Aug 21, 2024
pupnewfster
approved these changes
Aug 22, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks great, thanks! I will try to test it tomorrow, and assuming I don't run into any bugs, and that it doesn't accidentally introduce a hard dep on framed blocks I will go ahead and merge it afterwards.
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.
Changes proposed in this pull request:
Add FramedBlocks integration to support chemicals as camos on framed blocks.
A few noteworthy points:
IChemicalConstant
levelI've left a TODO aboutAddressedMapColor
as the chemicals of course don't have any, considering they are never placed in-world. Returning null will fall back to the framed block's map color. It might be interesting to store a mapping of chemical->map color in the integration which is automatically computed from the chemical's color representationStepping/falling on, hitting and breaking a block with a chemical camo uses the stone sound type for now. Fluid camos have the same issue and I have not found a satisfactory solution for this yetAddressed