Skip to content

Add long grass legacy conversion #13534

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 long grass legacy conversion #13534

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
4dcd54e
Add long grass legacy conversion
MartijnMuijsers Jan 9, 2026
6addc1f
Address the failing test
MartijnMuijsers Jan 10, 2026
9d2fd44
Simplify code
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
32 changes: 32 additions & 0 deletions 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,6 +325,10 @@ public static void init() {
if (!material.isLegacy()) {
continue;
}
// Do old long grass separately
if (material == Material.LEGACY_LONG_GRASS) {
continue;
}

// Handle blocks
if (isBlock(material)) { // Use custom method instead of Material#isBlock since it relies on this being already run
Expand Down Expand Up @@ -432,6 +436,34 @@ public static void init() {
itemToMaterial.put(newMaterial, matData);
}
}

// Do old long grass
for (byte data = 0; data < 16; data++) {
MaterialData matData = new MaterialData(Material.LEGACY_LONG_GRASS, data);
Item nonLegacyItem;
Block nonLegacyBlock;
switch (data) {
case 1 -> {
nonLegacyItem = Items.SHORT_GRASS;
nonLegacyBlock = Blocks.SHORT_GRASS;
}
case 2 -> {
nonLegacyItem = Items.FERN;
nonLegacyBlock = Blocks.FERN;
}
default -> {
nonLegacyItem = Items.DEAD_BUSH;
nonLegacyBlock = Blocks.DEAD_BUSH;
}
}
materialToItem.put(matData, nonLegacyItem);
materialToBlock.put(matData, nonLegacyBlock);
// Only apply reverse mapping for SHORT_GRASS and FERN, since DEAD_BUSH should map to LEGACY_DEAD_BUSH instead
if (data == 1 || data == 2) {
itemToMaterial.put(nonLegacyItem, matData);
blockToMaterial.put(nonLegacyBlock, matData);
}
}
}

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 @@ -159,7 +159,7 @@ public class LegacyTest {
//
Material.LEGACY_AIR, Material.LEGACY_DEAD_BUSH, Material.LEGACY_BURNING_FURNACE, Material.LEGACY_WALL_SIGN, Material.LEGACY_REDSTONE_TORCH_OFF, Material.LEGACY_SKULL, Material.LEGACY_REDSTONE_COMPARATOR_ON, Material.LEGACY_WALL_BANNER, Material.LEGACY_MONSTER_EGG));

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,
private final Set<Material> INVERSION_FAILS = new HashSet<>(Arrays.asList(Material.LEGACY_LONG_GRASS, 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_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));
Expand Down
Loading