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

MaterialIconSet Specific Fluid Textures #61

Merged
merged 7 commits into from
Aug 5, 2021
Merged

Conversation

TechLord22
Copy link
Member

What:
This PR adds MaterialIconSet support for fluids. This allows resourcepack makers to have finer control over more textures, as well as gives the ability mod-side to better diversify material appearances.

How solved:
Fluid textures were added to each IconSet in the blocks directory, and new sprites were registered for them. Materials were then made to use their iconset for automatic texture application by default, while still allowing manual texture specification. A new MaterialIconType for fluids was added in order to do this.

All CEu iconsets have fluid textures specified.

Outcome:
Fluids utilize MaterialIconSets for textures, instead of a single universal default.
Distilled Water is now a regular material, does not have weird bucket behavior.
The mod can now compile as a result of fully removing Hydrated Coal.
Many custom fluid textures were removed, as they were no longer required with the new system.

Additional info:
Before and After Comparisons:

This first comparison is for Titanium Tetrachloride, Ethylene, Oxygen, and Polyethylene. Previously TiCl4 and Oxygen both used custom fluid textures, and Ethylene and Polyethylene used the universal default fluid texture. Now TiCl4 uses its custom texture, Oxygen and Ethylene use the GAS iconset, and Polyethylene uses the DULL iconset for fluids. I should note that the DULL iconset image is the same for all other iconsets excluding FLUID and GAS, and is also animated.
image
image

This second comparison is to better demonstrate the DULL fluid iconset.
image
image

Next is an example with a more vibrant color. This is liquid copper.
image
image

Next is a "comparison" to show that materials with the Fluid iconset are not changed.
image
image

This last comparison is to better demonstrate the new Gas fluid iconset.
image
image

@TechLord22 TechLord22 requested a review from serenibyss August 5, 2021 20:31
@serenibyss serenibyss merged commit b7e2f15 into master Aug 5, 2021
@Yefancy Yefancy deleted the fluid_iconsets branch November 9, 2021 04:48
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.

2 participants