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

Remove Java custom armor trims when translating item to Bedrock to prevent visual issues #4548

Merged
merged 3 commits into from
Apr 4, 2024
Merged

Remove Java custom armor trims when translating item to Bedrock to prevent visual issues #4548

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
14dcb4d
Fix (or workaround) armor items with custom armor trims having no tex…
eclipseisoffline Apr 4, 2024
0547724
Fix armor items with custom trims causing issues on entity models by …
eclipseisoffline Apr 4, 2024
22b1b81
Refer to minecraft namespace inline for consistency
eclipseisoffline Apr 4, 2024
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
8 changes: 8 additions & 0 deletions core/src/main/java/org/geysermc/geyser/item/type/ArmorItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,14 @@ public void translateNbtToBedrock(@NonNull GeyserSession session, @NonNull Compo
if (tag.get("Trim") instanceof CompoundTag trim) {
StringTag material = trim.remove("material");
StringTag pattern = trim.remove("pattern");

// discard custom trim patterns/materials to prevent visual glitches on bedrock
if (!material.getValue().startsWith("minecraft:")
|| !pattern.getValue().startsWith("minecraft:")) {
tag.remove("Trim");
return;
}

// bedrock has an uppercase first letter key, and the value is not namespaced
trim.put(new StringTag("Material", stripNamespace(material.getValue())));
trim.put(new StringTag("Pattern", stripNamespace(pattern.getValue())));
Expand Down
Loading