Re-opening PR: Fix wrong model layer and texture applied to openable armor #162

Open
Spyeedy wants to merge 3 commits from Spyeedy/1.20/dev-openable-fix into 1.20/dev
Spyeedy commented 2025-08-11 09:24:52 +00:00 (Migrated from github.com)

Note: This PR is a duplicate of https://github.com/ThreeTAG/Palladium/pull/148. I was renaming branches and well, this shit happened.

When a openable armor renderer has 2 different textures and 2 model layers for the "default" and "open" states, the textures and model layers are wrongly applied respectively.

For openable armor that has no open timer, the "default" state's model layer is used for the "open" state as well.
For openable armor that has a timer, the "open" texture is used for the default state. More specifically, the open animation's first frame texture is used.

This PR strives to fix this issue, and I pray that no further bugs were introduced for openable armors. I have tested it as vigorously as I could 😭. This bug drove me crazy 💀

**Note:** This PR is a duplicate of https://github.com/ThreeTAG/Palladium/pull/148. I was renaming branches and well, this shit happened. ------ When a openable armor renderer has 2 different textures and 2 model layers for the "default" and "open" states, the textures and model layers are wrongly applied respectively. For openable armor that has no open timer, the "default" state's model layer is used for the "open" state as well. For openable armor that has a timer, the "open" texture is used for the default state. More specifically, the open animation's first frame texture is used. This PR strives to fix this issue, and I pray that no further bugs were introduced for openable armors. I have tested it as vigorously as I could 😭. This bug drove me crazy 💀
This pull request has changes conflicting with the target branch.
  • run/addonpacks/Test Pack/assets/test/lang/en_us.json
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin Spyeedy/1.20/dev-openable-fix:Spyeedy/1.20/dev-openable-fix
git switch Spyeedy/1.20/dev-openable-fix

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch 1.20/dev
git merge --no-ff Spyeedy/1.20/dev-openable-fix
git switch Spyeedy/1.20/dev-openable-fix
git rebase 1.20/dev
git switch 1.20/dev
git merge --ff-only Spyeedy/1.20/dev-openable-fix
git switch Spyeedy/1.20/dev-openable-fix
git rebase 1.20/dev
git switch 1.20/dev
git merge --no-ff Spyeedy/1.20/dev-openable-fix
git switch 1.20/dev
git merge --squash Spyeedy/1.20/dev-openable-fix
git switch 1.20/dev
git merge --ff-only Spyeedy/1.20/dev-openable-fix
git switch 1.20/dev
git merge Spyeedy/1.20/dev-openable-fix
git push origin 1.20/dev
Sign in to join this conversation.
No description provided.