make tests pass

patches/api/Add-Material-Tags.patch

@@ -223,7 +223,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     */
 +    public static final MaterialSetTag DOORS = new MaterialSetTag(keyFor("doors"))
 +        .endsWith("_DOOR")
-+        .ensureSize("DOORS", 11).lock();
++        .ensureSize("DOORS", 12).lock();
 +
 +    /**
 +     * Covers all dyes.
@@ -237,14 +237,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     */
 +    public static final MaterialSetTag FENCE_GATES = new MaterialSetTag(keyFor("fence_gates"))
 +        .endsWith("_GATE")
-+        .ensureSize("FENCE_GATES", 10).lock();
++        .ensureSize("FENCE_GATES", 11).lock();
 +
 +    /**
 +     * Covers all variants of fences.
 +     */
 +    public static final MaterialSetTag FENCES = new MaterialSetTag(keyFor("fences"))
 +        .endsWith("_FENCE")
-+        .ensureSize("FENCES", 11).lock();
++        .ensureSize("FENCES", 12).lock();
 +
 +    /**
 +     * Covers all variants of fish buckets.
@@ -358,7 +358,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     */
 +    public static final MaterialSetTag PRESSURE_PLATES = new MaterialSetTag(keyFor("pressure_plates"))
 +        .endsWith("_PRESSURE_PLATE")
-+        .ensureSize("PRESSURE_PLATES", 14).lock();
++        .ensureSize("PRESSURE_PLATES", 15).lock();
 +
 +    /**
 +     * Covers the variants of prismarine blocks.
@@ -429,6 +429,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    public static final MaterialSetTag SKULLS = new MaterialSetTag(keyFor("skulls"))
 +        .endsWith("_HEAD")
 +        .endsWith("_SKULL")
++        .not(Material.POTTERY_SHARD_SKULL)
 +        .not(Material.PISTON_HEAD)
 +        .ensureSize("SKULLS", 14).lock();
 +
@@ -437,7 +438,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     */
 +    public static final MaterialSetTag SPAWN_EGGS = new MaterialSetTag(keyFor("spawn_eggs"))
 +        .endsWith("_SPAWN_EGG")
-+        .ensureSize("SPAWN_EGGS", 76).lock();
++        .ensureSize("SPAWN_EGGS", 77).lock();
 +
 +    /**
 +     * Covers all colors of stained glass.
@@ -458,7 +459,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     */
 +    public static final MaterialSetTag TRAPDOORS = new MaterialSetTag(keyFor("trapdoors"))
 +        .endsWith("_TRAPDOOR")
-+        .ensureSize("TRAPDOORS", 11).lock();
++        .ensureSize("TRAPDOORS", 12).lock();
 +
 +    /**
 +     * Covers all wood variants of doors.
@@ -466,7 +467,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    public static final MaterialSetTag WOODEN_DOORS = new MaterialSetTag(keyFor("wooden_doors"))
 +        .endsWith("_DOOR")
 +        .not(Material.IRON_DOOR)
-+        .ensureSize("WOODEN_DOORS", 10).lock();
++        .ensureSize("WOODEN_DOORS", 11).lock();
 +
 +    /**
 +     * Covers all wood variants of fences.
@@ -474,7 +475,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    public static final MaterialSetTag WOODEN_FENCES = new MaterialSetTag(keyFor("wooden_fences"))
 +        .endsWith("_FENCE")
 +        .not(Material.NETHER_BRICK_FENCE)
-+        .ensureSize("WOODEN_FENCES", 10).lock();
++        .ensureSize("WOODEN_FENCES", 11).lock();
 +
 +    /**
 +     * Covers all wood variants of trapdoors.
@@ -482,14 +483,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    public static final MaterialSetTag WOODEN_TRAPDOORS = new MaterialSetTag(keyFor("wooden_trapdoors"))
 +        .endsWith("_TRAPDOOR")
 +        .not(Material.IRON_TRAPDOOR)
-+        .ensureSize("WOODEN_TRAPDOORS", 10).lock();
++        .ensureSize("WOODEN_TRAPDOORS", 11).lock();
 +
 +    /**
 +     * Covers the wood variants of gates.
 +     */
 +    public static final MaterialSetTag WOODEN_GATES = new MaterialSetTag(keyFor("wooden_gates"))
 +        .endsWith("_GATE")
-+        .ensureSize("WOODEN_GATES", 10).lock();
++        .ensureSize("WOODEN_GATES", 11).lock();
 +
 +    /**
 +     * Covers the variants of purpur.
@@ -503,7 +504,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     */
 +    public static final MaterialSetTag SIGNS = new MaterialSetTag(keyFor("signs"))
 +        .endsWith("_SIGN")
-+        .ensureSize("SIGNS", 40).lock();
++        .ensureSize("SIGNS", 44).lock();
 +
 +    /**
 +     * Covers the variants of a regular torch.

patches/api/Add-missing-biome-enum.patch

@@ -0,0 +1,21 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <jake.m.potrebic@gmail.com>
+Date: Tue, 14 Mar 2023 16:28:02 -0700
+Subject: [PATCH] Add missing biome enum
+
+
+diff --git a/src/main/java/org/bukkit/block/Biome.java b/src/main/java/org/bukkit/block/Biome.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/block/Biome.java
++++ b/src/main/java/org/bukkit/block/Biome.java
+@@ -0,0 +0,0 @@ public enum Biome implements Keyed, net.kyori.adventure.translation.Translatable
+     LUSH_CAVES,
+     DEEP_DARK,
+     MEADOW,
++    // Paper start - add missing biome
++    @org.jetbrains.annotations.ApiStatus.Experimental
++    CHERRY_GROVE,
++    // Paper end
+     GROVE,
+     SNOWY_SLOPES,
+     FROZEN_PEAKS,

patches/api/Add-missing-isFuel-Material-entries.patch

@@ -64,6 +64,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            case CHERRY_FENCE:
 +            case CHERRY_FENCE_GATE:
 +            case CHERRY_HANGING_SIGN:
++            case CHERRY_LOG:
 +            case CHERRY_PLANKS:
 +            case CHERRY_PRESSURE_PLATE:
 +            case CHERRY_SAPLING:
@@ -71,6 +72,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            case CHERRY_SLAB:
 +            case CHERRY_STAIRS:
 +            case CHERRY_TRAPDOOR:
++            case CHERRY_WOOD:
 +            // Paper end
              case CHEST:
              case CHISELED_BOOKSHELF:
@@ -122,4 +124,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            case STRIPPED_BAMBOO_BLOCK: // Paper
              case STRIPPED_BIRCH_LOG:
              case STRIPPED_BIRCH_WOOD:
++            case STRIPPED_CHERRY_LOG: // Paper
++            case STRIPPED_CHERRY_WOOD: // Paper
              case STRIPPED_DARK_OAK_LOG:
+             case STRIPPED_DARK_OAK_WOOD:
+             case STRIPPED_JUNGLE_LOG: