Skip to content

Add missing minecraft:dyeable item tag for 1.21.5 -> 1.21.4 downgrade #1244

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

Open
roggy666 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add missing minecraft:dyeable item tag for 1.21.5 -> 1.21.4 downgrade #1244

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 27 additions & 0 deletions ...ain/java/com/viaversion/viabackwards/protocol/v1_21_5to1_21_4/Protocol1_21_5To1_21_4.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@
import com.viaversion.viaversion.protocols.v1_21_4to1_21_5.rewriter.RecipeDisplayRewriter1_21_5;
import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPacket1_21_2;
import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPackets1_21_2;
import com.viaversion.viaversion.api.data.FullMappings;
import com.viaversion.viaversion.api.minecraft.RegistryType;
import com.viaversion.viaversion.rewriter.BlockRewriter;
import com.viaversion.viaversion.rewriter.ParticleRewriter;
import com.viaversion.viaversion.rewriter.RecipeDisplayRewriter;
Expand Down Expand Up @@ -175,6 +177,31 @@ public void handleArgument(final PacketWrapper wrapper, final String argumentTyp
cancelClientbound(ClientboundPackets1_21_5.TEST_INSTANCE_BLOCK_STATUS);
}

@Override
protected void onMappingDataLoaded() {
super.onMappingDataLoaded();

// The minecraft:dyeable item tag was removed in 1.21.5, but the 1.21.4 client's
// EquipmentRenderer checks stack.isIn(ItemTags.DYEABLE) before applying dye color
// to the 3D armor model. Without this tag, colored leather armor appears as default brown.
final FullMappings itemMappings = getMappingData().getFullItemMappings();
if (itemMappings != null) {
final String[] dyeableItems = {
"minecraft:leather_helmet",
"minecraft:leather_chestplate",
"minecraft:leather_leggings",
"minecraft:leather_boots",
"minecraft:leather_horse_armor",
"minecraft:wolf_armor"
};
final int[] mappedIds = new int[dyeableItems.length];
for (int i = 0; i < dyeableItems.length; i++) {
mappedIds[i] = itemMappings.mappedId(dyeableItems[i]);
}
tagRewriter.addTagRaw(RegistryType.ITEM, "minecraft:dyeable", mappedIds);
}
}

@Override
public void init(final UserConnection user) {
addEntityTracker(user, new EntityTrackerBase(user, EntityTypes1_21_4.PLAYER));
Expand Down