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 override.txt support for special tiles #10140

Merged
merged 3 commits into from Aug 4, 2020
Merged

Implement override.txt support for special tiles #10140

merged 3 commits into from Aug 4, 2020

Conversation

ghost
Copy link

@ghost ghost commented Jul 2, 2020

Resolves #10132

This PR adds override targets for all special_tiles entries in node definitions, allowing texture packs to replace these textures. This makes overrides work properly with a variety of drawtypes.

The targets are named special1 through special6, covering the the current length of the special_tiles array.

Testing

To test, make a texture pack and try setting overrides on the special1 / special2 targets of appropriate drawtypes

  • flowingliquid
  • allfaces_optional (with simple leaves)
  • glasslike_framed (with paramtype2 = "glasslikeliquidlevel")
  • glasslike_framed_optional (with paramtype2 = "glasslikeliquidlevel")
  • plantlike_rooted
    Appropriate nodes can be found in devtest.

Alternatively, You can grab this texture pack: testure_pack.zip
It will override the relevant drawtype test nodes in devtest for you.

@sfan5 sfan5 added Feature ✨ PRs that add or enhance a feature Textures labels Jul 2, 2020
@ghost ghost marked this pull request as ready for review July 4, 2020 14:42
@ghost
Copy link
Author

ghost commented Jul 4, 2020

Ready for review. clang_format reports one issue, but I believe the current code passes the coding guidelines as written and this change wouldn't improve readability.

@sfan5
Copy link
Member

sfan5 commented Jul 5, 2020

You should put the code into a // clang-format off - // clang-format on block then so the CI won't fail.

@ghost
Copy link
Author

ghost commented Jul 5, 2020

Wasn't aware that was an option. I'll do it right away!

@ghost
Copy link
Author

ghost commented Jul 9, 2020

Rebased on 5.4.0, ready for review

Copy link
Member

@sfan5 sfan5 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, I hope you have tested this.

Copy link
Member

@SmallJoker SmallJoker left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Texture Packs - Add support for overriding special_tiles
2 participants