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 a couple model and model loader issues #1732

Merged
merged 8 commits into from
Dec 9, 2024

Conversation

XFactHD
Copy link
Member

@XFactHD XFactHD commented Dec 4, 2024

This PR fixes a couple issues with models and model loaders:

  • Fix BlockModelWrapper using the root model instead of the "pass" models
  • Fix OBJ and composite models ignoring all top-level properties (textures, item transforms, etc.)
  • Fix composite model builder generating the old format

@XFactHD XFactHD added bug A bug or error rendering Related to rendering 1.21.4 Targeted at Minecraft 1.21.4 labels Dec 4, 2024
@XFactHD XFactHD requested a review from Technici4n December 4, 2024 03:51
@neoforged-pr-publishing
Copy link

neoforged-pr-publishing bot commented Dec 4, 2024

  • Publish PR to GitHub Packages

Last commit published: b44f8593fa00e8fdb48cf8b6fa8d235f161c9904.

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 #1732' // https://github.com/neoforged/NeoForge/pull/1732
        url 'https://prmaven.neoforged.net/NeoForge/pr1732'
        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-pr1732.
On Powershell you will need to remove the -L flag from the curl invocation.

mkdir NeoForge-pr1732
cd NeoForge-pr1732
curl -L https://prmaven.neoforged.net/NeoForge/pr1732/net/neoforged/neoforge/21.4.20-beta-pr-1732-model_fixes/mdk-pr1732.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 4, 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: b44f8593fa00e8fdb48cf8b6fa8d235f161c9904.

Compatibility checks

neoforge (:neoforge)

  • net/neoforged/neoforge/client/model/UnbakedCompositeModel
    • <init>(Lcom/google/common/collect/ImmutableMap;Lcom/google/common/collect/ImmutableList;Lcom/mojang/math/Transformation;Ljava/util/Map;)V: ❗ API method was removed
  • net/minecraft/client/renderer/block/model/BlockModel
    • <init>(Lnet/minecraft/resources/ResourceLocation;Ljava/util/List;Lnet/minecraft/client/renderer/block/model/TextureSlots$Data;Ljava/lang/Boolean;Lnet/minecraft/client/resources/model/UnbakedModel$GuiLight;Lnet/minecraft/client/renderer/block/model/ItemTransforms;Lcom/mojang/math/Transformation;Lnet/neoforged/neoforge/client/RenderTypeGroup;)V: ❗ API method was removed
  • net/neoforged/neoforge/client/model/obj/ObjModel
    • isComponentVisible(Ljava/lang/String;Z)Z: ❗ API method was removed
    • rootTransform:Lcom/mojang/math/Transformation;: ❗ API field was removed
    • partVisibility:Ljava/util/Map;: ❗ API field was removed
  • net/neoforged/neoforge/client/model/obj/ObjModel$ModelSettings
    • rootTransform()Lcom/mojang/math/Transformation;: ❗ API method was removed
    • <init>(Lnet/minecraft/resources/ResourceLocation;ZZZZLjava/lang/String;Ljava/util/Map;Lcom/mojang/math/Transformation;)V: ❗ API method was removed
    • partVisibility()Ljava/util/Map;: ❗ API method was removed
  • net/neoforged/neoforge/client/model/obj/ObjModel$ModelObject
    • addQuads(Lnet/minecraft/client/resources/model/SimpleBakedModel$Builder;Lnet/minecraft/client/renderer/block/model/TextureSlots;Lnet/minecraft/client/resources/model/ModelBaker;Lnet/minecraft/client/resources/model/ModelState;ZZLnet/minecraft/client/renderer/block/model/ItemTransforms;)V: ❗ API method was removed
  • net/neoforged/neoforge/client/model/obj/ObjModel$ModelGroup
    • addQuads(Lnet/minecraft/client/resources/model/SimpleBakedModel$Builder;Lnet/minecraft/client/renderer/block/model/TextureSlots;Lnet/minecraft/client/resources/model/ModelBaker;Lnet/minecraft/client/resources/model/ModelState;ZZLnet/minecraft/client/renderer/block/model/ItemTransforms;)V: ❗ API method was removed
  • net/neoforged/neoforge/client/model/obj/ObjModel$ModelMesh
    • addQuads(Lnet/minecraft/client/resources/model/SimpleBakedModel$Builder;Lnet/minecraft/client/renderer/block/model/TextureSlots;Lnet/minecraft/client/resources/model/ModelBaker;Lnet/minecraft/client/resources/model/ModelState;ZZLnet/minecraft/client/renderer/block/model/ItemTransforms;)V: ❗ API method was removed
  • net/neoforged/neoforge/client/model/generators/loaders/CompositeModelBuilder
    • child(Ljava/lang/String;Lnet/neoforged/neoforge/client/model/generators/ModelBuilder;)Lnet/neoforged/neoforge/client/model/generators/loaders/CompositeModelBuilder;: ❗ API method was removed

@XFactHD XFactHD requested a review from Technici4n December 4, 2024 23:51
@XFactHD XFactHD requested a review from Technici4n December 6, 2024 00:57
Technici4n
Technici4n previously approved these changes Dec 8, 2024
Copy link
Member

@Technici4n Technici4n left a comment

Choose a reason for hiding this comment

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

Very nice, thanks! Having these fill methods in NeoForgeModelProperties is a good compromise between simplicity and code reuse I think.

@Technici4n Technici4n merged commit 1e73806 into neoforged:1.21.x Dec 9, 2024
6 checks passed
@XFactHD XFactHD deleted the model_fixes branch December 9, 2024 09:41
@neoforged-releases
Copy link

🚀 This PR has been released as NeoForge version 21.4.12-beta.

Soaryn pushed a commit to Soaryn/EnergyHandlerPR that referenced this pull request Jan 21, 2025
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.

2 participants