Fix some tests

Author: lynxplay

paper-server/patches/sources/net/minecraft/world/item/crafting/TransmuteRecipe.java.patch

@@ -1,13 +1,18 @@
 --- a/net/minecraft/world/item/crafting/TransmuteRecipe.java
 +++ b/net/minecraft/world/item/crafting/TransmuteRecipe.java
-@@ -213,6 +_,13 @@
+@@ -213,6 +_,18 @@
          return this.materialCount.max().orElse(8);
      }
 
 +    // CraftBukkit start
 +    @Override
 +    public org.bukkit.inventory.Recipe toBukkitRecipe(org.bukkit.NamespacedKey id) {
-+        return new org.bukkit.craftbukkit.inventory.CraftTransmuteRecipe(id, org.bukkit.craftbukkit.inventory.CraftItemType.minecraftToBukkit(this.result.item().orElseThrow().value()), org.bukkit.craftbukkit.inventory.CraftRecipe.toChoice(this.input), org.bukkit.craftbukkit.inventory.CraftRecipe.toChoice(this.material));
++        return new org.bukkit.craftbukkit.inventory.CraftTransmuteRecipe(
++            id,
++            org.bukkit.craftbukkit.inventory.CraftItemType.minecraftToBukkit(this.result.item().orElseGet(() -> this.input.values.iterator().next()).value()),
++            org.bukkit.craftbukkit.inventory.CraftRecipe.toChoice(this.input),
++            org.bukkit.craftbukkit.inventory.CraftRecipe.toChoice(this.material)
++        );
 +    }
 +    // CraftBukkit end
 +

paper-server/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java

@@ -333,19 +333,19 @@ public static void init() {
                     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
-                    if (blockTag.get("Name").asString("").contains("%%FILTER_ME%%")) {
+                    if (blockTag.get("id").asString("").contains("%%FILTER_ME%%")) {
                         continue;
                     }
 
-                    String name = blockTag.get("Name").asString("");
+                    String name = blockTag.get("id").asString("");
                     Block block = BuiltInRegistries.BLOCK.getValue(Identifier.parse(name));
                     if (block == null) {
                         continue;
                     }
                     BlockState state = block.defaultBlockState();
                     StateDefinition<?, ?> def = block.getStateDefinition();
 
-                    Optional<CompoundTag> propertiesTag = blockTag.getElement("Properties").result();
+                    Optional<CompoundTag> propertiesTag = blockTag.getElement("properties").result();
                     if (propertiesTag.isPresent()) {
                         CompoundTag properties = propertiesTag.get();
                         for (String propertyName : properties.keySet()) {

paper-server/src/test/java/org/bukkit/craftbukkit/legacy/LegacyTest.java

@@ -164,16 +164,19 @@ public class LegacyTest {
             Material.POTENT_SULFUR, Material.SULFUR, Material.SULFUR_BRICKS, Material.SULFUR_BRICK_SLAB, Material.SULFUR_BRICK_STAIRS, Material.SULFUR_BRICK_WALL, Material.SULFUR_CUBE_BUCKET, Material.SULFUR_CUBE_SPAWN_EGG, Material.SULFUR_SLAB, Material.SULFUR_SPIKE, Material.SULFUR_STAIRS,
             Material.SULFUR_WALL,
             // 26.3
-            Material.ABANDONED_CAMP_MAP, Material.BLACK_CUSHION, Material.BLUE_CUSHION, Material.BROWN_CUSHION, Material.CYAN_CUSHION, Material.GRAY_CUSHION, Material.GREEN_CUSHION, Material.LIGHT_BLUE_CUSHION, Material.LIGHT_GRAY_CUSHION, Material.LIME_CUSHION, Material.MAGENTA_CUSHION,
-            Material.ORANGE_CUSHION, Material.PINK_CUSHION, Material.PURPLE_CUSHION, Material.RED_CUSHION, Material.WHITE_CUSHION, Material.YELLOW_CUSHION, Material.BURIED_ANCIENT_CITY_MAP, Material.BURIED_MINESHAFT_MAP, Material.BURIED_TREASURE_MAP, Material.BURIED_TRIAL_CHAMBERS_MAP,
-            Material.DESERT_PYRAMID_MAP, Material.DESERT_VILLAGE_MAP, Material.JUNGLE_PYRAMID_MAP, Material.OCEAN_MONUMENT_MAP, Material.PLAINS_VILLAGE_MAP, Material.POPLAR_BOAT, Material.POPLAR_CHEST_BOAT, Material.SAVANNA_VILLAGE_MAP, Material.SNOWY_VILLAGE_MAP, Material.SWAMP_HUT_MAP,
-            Material.TAIGA_VILLAGE_MAP, Material.WARM_OCEAN_RUINS_MAP, Material.WOODLAND_MANSION_MAP, Material.BLACK_CONCRETE_SLAB, Material.BLACK_CONCRETE_STAIRS, Material.BLUE_CONCRETE_SLAB, Material.BLUE_CONCRETE_STAIRS, Material.BROWN_CONCRETE_SLAB, Material.BROWN_CONCRETE_STAIRS,
-            Material.CYAN_CONCRETE_SLAB, Material.CYAN_CONCRETE_STAIRS, Material.GRAY_CONCRETE_SLAB, Material.GRAY_CONCRETE_STAIRS, Material.GREEN_CONCRETE_SLAB, Material.GREEN_CONCRETE_STAIRS, Material.LIGHT_BLUE_CONCRETE_SLAB, Material.LIGHT_BLUE_CONCRETE_STAIRS,
-            Material.LIGHT_GRAY_CONCRETE_SLAB, Material.LIGHT_GRAY_CONCRETE_STAIRS, Material.LIME_CONCRETE_SLAB, Material.LIME_CONCRETE_STAIRS, Material.MAGENTA_CONCRETE_SLAB, Material.MAGENTA_CONCRETE_STAIRS, Material.ORANGE_CONCRETE_SLAB, Material.ORANGE_CONCRETE_STAIRS,
-            Material.PINK_CONCRETE_SLAB, Material.PINK_CONCRETE_STAIRS, Material.PURPLE_CONCRETE_SLAB, Material.PURPLE_CONCRETE_STAIRS, Material.RED_CONCRETE_SLAB, Material.RED_CONCRETE_STAIRS, Material.WHITE_CONCRETE_SLAB, Material.WHITE_CONCRETE_STAIRS, Material.YELLOW_CONCRETE_SLAB,
-            Material.YELLOW_CONCRETE_STAIRS, Material.POPLAR_BUTTON, Material.POPLAR_DOOR, Material.POPLAR_FENCE, Material.POPLAR_FENCE_GATE, Material.POPLAR_HANGING_SIGN, Material.POPLAR_LOG, Material.POPLAR_PLANKS, Material.POPLAR_PRESSURE_PLATE,
-            Material.POPLAR_SAPLING, Material.POPLAR_SHELF, Material.POPLAR_SIGN, Material.POPLAR_SLAB, Material.POPLAR_STAIRS, Material.POPLAR_TRAPDOOR, Material.POPLAR_WALL_HANGING_SIGN, Material.POPLAR_WALL_SIGN, Material.POPLAR_WOOD,
-            Material.ORANGE_POPLAR_LEAVES, Material.POTTED_POPLAR_SAPLING, Material.RED_POPLAR_LEAVES, Material.STRIPPED_POPLAR_LOG, Material.STRIPPED_POPLAR_WOOD, Material.YELLOW_POPLAR_LEAVES,
+            Material.ABANDONED_CAMP_MAP, Material.BLACK_CUSHION, Material.BLUE_CUSHION, Material.BROWN_CUSHION, Material.BURIED_ANCIENT_CITY_MAP, Material.BURIED_MINESHAFT_MAP, Material.BURIED_TREASURE_MAP, Material.BURIED_TRIAL_CHAMBERS_MAP, Material.CYAN_CUSHION, Material.DESERT_PYRAMID_MAP,
+            Material.DESERT_VILLAGE_MAP, Material.GRAY_CUSHION, Material.GREEN_CUSHION, Material.JUNGLE_PYRAMID_MAP, Material.LIGHT_BLUE_CUSHION, Material.LIGHT_GRAY_CUSHION, Material.LIME_CUSHION, Material.MAGENTA_CUSHION, Material.OCEAN_MONUMENT_MAP, Material.ORANGE_CUSHION, Material.PINK_CUSHION,
+            Material.PLAINS_VILLAGE_MAP, Material.POPLAR_BOAT, Material.POPLAR_CHEST_BOAT, Material.PURPLE_CUSHION, Material.RED_CUSHION, Material.SAVANNA_VILLAGE_MAP, Material.SNOWY_VILLAGE_MAP, Material.SWAMP_HUT_MAP, Material.TAIGA_VILLAGE_MAP, Material.WARM_OCEAN_RUINS_MAP, Material.WHITE_CUSHION,
+            Material.WOODLAND_MANSION_MAP, Material.YELLOW_CUSHION, Material.BLACK_CONCRETE_SLAB, Material.BLACK_CONCRETE_STAIRS, Material.BLACK_WOOL_SLAB, Material.BLACK_WOOL_STAIRS, Material.BLUE_CONCRETE_SLAB, Material.BLUE_CONCRETE_STAIRS, Material.BLUE_WOOL_SLAB, Material.BLUE_WOOL_STAIRS,
+            Material.BROWN_CONCRETE_SLAB, Material.BROWN_CONCRETE_STAIRS, Material.BROWN_WOOL_SLAB, Material.BROWN_WOOL_STAIRS, Material.CYAN_CONCRETE_SLAB, Material.CYAN_CONCRETE_STAIRS, Material.CYAN_WOOL_SLAB, Material.CYAN_WOOL_STAIRS, Material.GRAY_CONCRETE_SLAB, Material.GRAY_CONCRETE_STAIRS,
+            Material.GRAY_WOOL_SLAB, Material.GRAY_WOOL_STAIRS, Material.GREEN_CONCRETE_SLAB, Material.GREEN_CONCRETE_STAIRS, Material.GREEN_WOOL_SLAB, Material.GREEN_WOOL_STAIRS, Material.LIGHT_BLUE_CONCRETE_SLAB, Material.LIGHT_BLUE_CONCRETE_STAIRS, Material.LIGHT_BLUE_WOOL_SLAB,
+            Material.LIGHT_BLUE_WOOL_STAIRS, Material.LIGHT_GRAY_CONCRETE_SLAB, Material.LIGHT_GRAY_CONCRETE_STAIRS, Material.LIGHT_GRAY_WOOL_SLAB, Material.LIGHT_GRAY_WOOL_STAIRS, Material.LIME_CONCRETE_SLAB, Material.LIME_CONCRETE_STAIRS, Material.LIME_WOOL_SLAB, Material.LIME_WOOL_STAIRS,
+            Material.MAGENTA_CONCRETE_SLAB, Material.MAGENTA_CONCRETE_STAIRS, Material.MAGENTA_WOOL_SLAB, Material.MAGENTA_WOOL_STAIRS, Material.ORANGE_CONCRETE_SLAB, Material.ORANGE_CONCRETE_STAIRS, Material.ORANGE_POPLAR_LEAVES, Material.ORANGE_WOOL_SLAB, Material.ORANGE_WOOL_STAIRS,
+            Material.PINK_CONCRETE_SLAB, Material.PINK_CONCRETE_STAIRS, Material.PINK_WOOL_SLAB, Material.PINK_WOOL_STAIRS, Material.POPLAR_BUTTON, Material.POPLAR_DOOR, Material.POPLAR_FENCE, Material.POPLAR_FENCE_GATE, Material.POPLAR_HANGING_SIGN, Material.POPLAR_LOG, Material.POPLAR_PLANKS,
+            Material.POPLAR_PRESSURE_PLATE, Material.POPLAR_SAPLING, Material.POPLAR_SHELF, Material.POPLAR_SIGN, Material.POPLAR_SLAB, Material.POPLAR_STAIRS, Material.POPLAR_TRAPDOOR, Material.POPLAR_WALL_HANGING_SIGN, Material.POPLAR_WALL_SIGN, Material.POPLAR_WOOD, Material.POTTED_POPLAR_SAPLING,
+            Material.PURPLE_CONCRETE_SLAB, Material.PURPLE_CONCRETE_STAIRS, Material.PURPLE_WOOL_SLAB, Material.PURPLE_WOOL_STAIRS, Material.RED_CONCRETE_SLAB, Material.RED_CONCRETE_STAIRS, Material.RED_POPLAR_LEAVES, Material.RED_SHRUB, Material.RED_WOOL_SLAB, Material.RED_WOOL_STAIRS,
+            Material.SHELF_MUSHROOM, Material.STRAW_BED, Material.STRIPPED_POPLAR_LOG, Material.STRIPPED_POPLAR_WOOD, Material.WHITE_CONCRETE_SLAB, Material.WHITE_CONCRETE_STAIRS, Material.WHITE_WOOL_SLAB, Material.WHITE_WOOL_STAIRS, Material.YELLOW_CONCRETE_SLAB, Material.YELLOW_CONCRETE_STAIRS,
+            Material.YELLOW_POPLAR_LEAVES, Material.YELLOW_WOOL_SLAB, Material.YELLOW_WOOL_STAIRS,
             //
             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));