Skip to content

Add heads legacy conversion #13533

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
MartijnMuijsers wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Add heads legacy conversion #13533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1a6d8f3
Add head block legacy conversion
MartijnMuijsers Jan 9, 2026
ed16883
Implement reverse conversion
MartijnMuijsers Jan 10, 2026
d8a54ec
Apply to items too
MartijnMuijsers Jan 10, 2026
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
46 changes: 45 additions & 1 deletion paper-server/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,14 +325,18 @@ public static void init() {
if (!material.isLegacy()) {
continue;
}
// Do old heads separately
if (material == Material.LEGACY_SKULL || material == Material.LEGACY_SKULL_ITEM) {
continue;
}

// Handle blocks
if (isBlock(material)) { // Use custom method instead of Material#isBlock since it relies on this being already run
for (byte data = 0; data < 16; data++) {
MaterialData matData = new MaterialData(material, data);
Dynamic blockTag = BlockStateData.getTag(material.getId() << 4 | data);
blockTag = DataFixers.getDataFixer().update(References.BLOCK_STATE, blockTag, 100, CraftMagicNumbers.INSTANCE.getDataVersion());
// TODO: better skull conversion, chests
// TODO: chests
if (blockTag.get("Name").asString("").contains("%%FILTER_ME%%")) {
continue;
}
Expand Down Expand Up @@ -432,6 +436,46 @@ public static void init() {
itemToMaterial.put(newMaterial, matData);
}
}

// Do old heads
for (byte data = 0; data < 16; data++) {
MaterialData itemMatData = new MaterialData(Material.LEGACY_SKULL_ITEM, data);
MaterialData blockMatData = new MaterialData(Material.LEGACY_SKULL, data);
Item nonLegacyItem;
Block nonLegacyBlock;
switch (data) {
case 1 -> {
nonLegacyItem = Items.WITHER_SKELETON_SKULL;
nonLegacyBlock = Blocks.WITHER_SKELETON_SKULL;
}
case 2 -> {
nonLegacyItem = Items.ZOMBIE_HEAD;
nonLegacyBlock = Blocks.ZOMBIE_HEAD;
}
case 3 -> {
nonLegacyItem = Items.PLAYER_HEAD;
nonLegacyBlock = Blocks.PLAYER_HEAD;
}
case 4 -> {
nonLegacyItem = Items.CREEPER_HEAD;
nonLegacyBlock = Blocks.CREEPER_HEAD;
}
case 5 -> {
nonLegacyItem = Items.DRAGON_HEAD;
nonLegacyBlock = Blocks.DRAGON_HEAD;
}
default -> {
nonLegacyItem = Items.SKELETON_SKULL;
nonLegacyBlock = Blocks.SKELETON_SKULL;
}
}
materialToItem.put(itemMatData, nonLegacyItem);
materialToBlock.put(blockMatData, nonLegacyBlock);
if (data <= 5) {
itemToMaterial.put(nonLegacyItem, itemMatData);
blockToMaterial.put(nonLegacyBlock, blockMatData);
}
}
}

private static boolean isBlock(Material material) {
Expand Down
2 changes: 1 addition & 1 deletion paper-server/src/test/java/org/bukkit/craftbukkit/legacy/LegacyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ public class LegacyTest {

private final Set<Material> INVERSION_FAILS = new HashSet<>(Arrays.asList(Material.LEGACY_DOUBLE_STEP, Material.LEGACY_GLOWING_REDSTONE_ORE, Material.LEGACY_DIODE_BLOCK_ON, Material.LEGACY_REDSTONE_LAMP_ON, Material.LEGACY_WOOD_DOUBLE_STEP,
Material.LEGACY_DAYLIGHT_DETECTOR_INVERTED, Material.LEGACY_DOUBLE_STONE_SLAB2, Material.LEGACY_PURPUR_DOUBLE_SLAB, Material.LEGACY_WHEAT, Material.LEGACY_SIGN, Material.LEGACY_WOOD_DOOR, Material.LEGACY_IRON_DOOR, Material.LEGACY_SUGAR_CANE,
Material.LEGACY_CAKE, Material.LEGACY_BED, Material.LEGACY_DIODE, Material.LEGACY_NETHER_STALK, Material.LEGACY_BREWING_STAND_ITEM, Material.LEGACY_CAULDRON_ITEM, Material.LEGACY_REDSTONE_COMPARATOR, Material.LEGACY_SPRUCE_DOOR_ITEM,
Material.LEGACY_CAKE, Material.LEGACY_BED, Material.LEGACY_DIODE, Material.LEGACY_NETHER_STALK, Material.LEGACY_BREWING_STAND_ITEM, Material.LEGACY_CAULDRON_ITEM, Material.LEGACY_SKULL_ITEM, Material.LEGACY_REDSTONE_COMPARATOR, Material.LEGACY_SPRUCE_DOOR_ITEM,
Material.LEGACY_BIRCH_DOOR_ITEM, Material.LEGACY_JUNGLE_DOOR_ITEM, Material.LEGACY_ACACIA_DOOR_ITEM, Material.LEGACY_DARK_OAK_DOOR_ITEM, Material.LEGACY_STATIONARY_LAVA, Material.LEGACY_STATIONARY_WATER));

@Test
Expand Down
Loading