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.

Sign up for GitHub

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

Guard against item BakedModels using incorrect RenderTypes #1822

Merged
merged 4 commits into from
Jan 10, 2025
Merged

Guard against item BakedModels using incorrect RenderTypes #1822

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f7e1a61
Guard against item BakedModels using incorrect RenderTypes
Technici4n Jan 4, 2025
9c50b12
Used the wrong param
Technici4n Jan 4, 2025
7fd388d
Only check for chunk render types
Technici4n Jan 10, 2025
2032d12
Use faster check
Technici4n Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions patches/net/minecraft/client/renderer/item/ItemStackRenderState.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,21 @@
}
}

@@ -116,6 +_,14 @@
}

public void setupBlockModel(BakedModel p_386829_, RenderType p_387529_) {
+ // Neo: Guard against models using chunk render types.
+ if (p_387529_.getChunkLayerId() != -1) {
+ throw new IllegalArgumentException("""
+ Attempting to render an item BakedModel with an invalid RenderType: %s.
+ Chunk render types are not supported, and the equivalent render types from the Sheets class should be used.
+ Model: %s.
+ """.formatted(p_387529_, p_386829_));
+ }
this.model = p_386829_;
this.renderType = p_387529_;
}
@@ -149,6 +_,9 @@

void render(PoseStack p_387607_, MultiBufferSource p_386763_, int p_387589_, int p_388775_) {
Expand Down
Loading