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

[1.21.4] Fix armor property copying and tintable armor rendering #1740

Merged
merged 4 commits into from
Dec 18, 2024

Conversation

XFactHD
Copy link
Member

@XFactHD XFactHD commented Dec 5, 2024

This PR fixes tintable armor rendering black when no tint is applied (i.e. default leather armor) and fixes model properties not getting copied when a mod provides a custom humanoid armor model.
The codepath for replacing armor models is also cleaned up slightly.

Fixes #1612

As a side-note: all the armor model hooks should be looked into to see whether they still work as intended and are still useful. I myself don't have the necessary experience with custom armor models to judge this though.

@XFactHD XFactHD added bug A bug or error rendering Related to rendering 1.21.4 Targeted at Minecraft 1.21.4 labels Dec 5, 2024
@neoforged-pr-publishing
Copy link

neoforged-pr-publishing bot commented Dec 5, 2024

  • Publish PR to GitHub Packages

Last commit published: af91ab772c55b0aceba8240432e209e71a92c40e.

PR Publishing

The artifacts published by this PR:

Repository Declaration

In order to use the artifacts published by the PR, add the following repository to your buildscript:

repositories {
    maven {
        name 'Maven for PR #1740' // https://github.com/neoforged/NeoForge/pull/1740
        url 'https://prmaven.neoforged.net/NeoForge/pr1740'
        content {
            includeModule('net.neoforged', 'neoforge')
            includeModule('net.neoforged', 'testframework')
        }
    }
}

MDK installation

In order to setup a MDK using the latest PR version, run the following commands in a terminal.
The script works on both *nix and Windows as long as you have the JDK bin folder on the path.
The script will clone the MDK in a folder named NeoForge-pr1740.
On Powershell you will need to remove the -L flag from the curl invocation.

mkdir NeoForge-pr1740
cd NeoForge-pr1740
curl -L https://prmaven.neoforged.net/NeoForge/pr1740/net/neoforged/neoforge/21.4.35-beta-pr-1740-equipment_rendering/mdk-pr1740.zip -o mdk.zip
jar xf mdk.zip
rm mdk.zip || del mdk.zip

To test a production environment, you can download the installer from here.

@neoforged-compatibility-checks
Copy link

neoforged-compatibility-checks bot commented Dec 5, 2024

@XFactHD, this PR introduces breaking changes.
Fortunately, this project is currently accepting breaking changes, but if they are not intentional, please revert them.
Last checked commit: af91ab772c55b0aceba8240432e209e71a92c40e.

neoforge (:neoforge)

  • net/minecraft/client/renderer/entity/layers/EquipmentLayerRenderer
    • getArmorModelHook(Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/client/resources/model/EquipmentClientInfo$LayerType;Lnet/minecraft/client/model/Model;)Lnet/minecraft/client/model/Model;: ❗ API method was removed
  • net/neoforged/neoforge/client/ClientHooks
    • getArmorModel(Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/client/resources/model/EquipmentClientInfo$LayerType;Lnet/minecraft/client/model/Model;)Lnet/minecraft/client/model/Model;: ❗ API method was removed

@TelepathicGrunt TelepathicGrunt merged commit 20c22e6 into neoforged:1.21.x Dec 18, 2024
6 checks passed
@XFactHD XFactHD deleted the equipment_rendering branch December 18, 2024 21:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
1.21.4 Targeted at Minecraft 1.21.4 bug A bug or error rendering Related to rendering
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[1.21.2-1.21.4] If leather armor is not dyed, it is dyed black instead of transparent.
2 participants