Updated Upstream (Bukkit/CraftBukkit)

Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
fdef9473 Correct Material#isFuel for new experimental materials
42811598 SPIGOT-7293: Add Biome#CHERRY_GROVE

CraftBukkit Changes:
968d28df0 Fix availability of experimental datapack features in unit tests

patches/api/0213-Add-methods-to-get-translation-keys.patch

@@ -144,7 +144,7 @@ index 753bfcec441533071120d925c83789ef53afa176..c6bc84a8755b2fe5d7d8d3ec857700ec
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index a5fe6fe103df59c01649ddcd0e1f27c27a452cff..0aa1692731ffb05e812f904459853da6080c3f9f 100644
+index c154e94acda00924f81368f2aad1933726596b17..9117bbfb5208231752cfa757c0d088bc270d43b9 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
 @@ -116,7 +116,7 @@ import org.jetbrains.annotations.Nullable;
@@ -172,7 +172,7 @@ index a5fe6fe103df59c01649ddcd0e1f27c27a452cff..0aa1692731ffb05e812f904459853da6
      // Paper end
  
      /**
-@@ -10847,9 +10856,11 @@ public enum Material implements Keyed, Translatable {
+@@ -10887,9 +10896,11 @@ public enum Material implements Keyed, Translatable {
       * material
       * @see #getBlockTranslationKey()
       * @see #getItemTranslationKey()
@@ -232,7 +232,7 @@ index 13eac9ad2c1672051635d1c35cc49239252e7a61..107e36ef02a9481954bd770ce9a55a0b
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/block/Biome.java b/src/main/java/org/bukkit/block/Biome.java
-index 02c5fcbc76b2db6bf4eb7580456b5658c08272b4..d56e1b50dd7da18f40278cec4bfdc9414aae0be1 100644
+index d3087d60378822cdd7cea25fd63d3f496e3cd2fb..5d8fa5b39a5d50cca48ba63af3a84b80f279b649 100644
 --- a/src/main/java/org/bukkit/block/Biome.java
 +++ b/src/main/java/org/bukkit/block/Biome.java
 @@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull;
@@ -244,7 +244,7 @@ index 02c5fcbc76b2db6bf4eb7580456b5658c08272b4..d56e1b50dd7da18f40278cec4bfdc941
      OCEAN,
      PLAINS,
      DESERT,
-@@ -88,4 +88,11 @@ public enum Biome implements Keyed {
+@@ -89,4 +89,11 @@ public enum Biome implements Keyed {
      public NamespacedKey getKey() {
          return key;
      }

patches/api/0404-Mark-experimental-api-as-such.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Mark experimental api as such
 
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 716a40b055e693cfda38d2d8223ce4320919a332..5387070a2f668871334ef522d8a3c645d899372a 100644
+index 842a9dd6f92737699529721ec4e06fbc225fa3e6..3c5e90f039f0d2991be442168703526405e18e3d 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
 @@ -155,12 +155,15 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
@@ -972,6 +972,18 @@ index d355c91748796f74064b5c34090f1ccafc0f1de0..ab40b68c8c4a32e3ae10708d23065856
 +    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20
      CHERRY,
  }
+diff --git a/src/main/java/org/bukkit/block/Biome.java b/src/main/java/org/bukkit/block/Biome.java
+index 5d8fa5b39a5d50cca48ba63af3a84b80f279b649..612ebdd08816438f5532f367ce2f64eb3a9803ff 100644
+--- a/src/main/java/org/bukkit/block/Biome.java
++++ b/src/main/java/org/bukkit/block/Biome.java
+@@ -72,6 +72,7 @@ public enum Biome implements Keyed, net.kyori.adventure.translation.Translatable
+     FROZEN_PEAKS,
+     JAGGED_PEAKS,
+     STONY_PEAKS,
++    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20
+     CHERRY_GROVE,
+     /**
+      * Represents a custom Biome
 diff --git a/src/main/java/org/bukkit/block/ChiseledBookshelf.java b/src/main/java/org/bukkit/block/ChiseledBookshelf.java
 index 4cae298f18b35f73e3a64d5c8926bdc0f0402c4b..fee629dce62bc3978204f9b3a8e0aab72197ccfb 100644
 --- a/src/main/java/org/bukkit/block/ChiseledBookshelf.java

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

@@ -1,131 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Sun, 12 Feb 2023 10:52:22 -0800
-Subject: [PATCH] Add missing isFuel Material entries
-
-
-diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 5387070a2f668871334ef522d8a3c645d899372a..bd32af93807815e23b9cf5e51ba6025170a1dee7 100644
---- a/src/main/java/org/bukkit/Material.java
-+++ b/src/main/java/org/bukkit/Material.java
-@@ -7696,6 +7696,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
-             case ACACIA_DOOR:
-             case ACACIA_FENCE:
-             case ACACIA_FENCE_GATE:
-+            case ACACIA_HANGING_SIGN: // Paper
-             case ACACIA_LOG:
-             case ACACIA_PLANKS:
-             case ACACIA_PRESSURE_PLATE:
-@@ -7707,9 +7708,27 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
-             case ACACIA_WOOD:
-             case AZALEA:
-             case BAMBOO:
-+            // Paper start - add missing fuels
-+            case BAMBOO_BLOCK:
-+            case BAMBOO_BUTTON:
-+            case BAMBOO_CHEST_RAFT:
-+            case BAMBOO_DOOR:
-+            case BAMBOO_FENCE:
-+            case BAMBOO_FENCE_GATE:
-+            case BAMBOO_HANGING_SIGN:
-+            // Paper end
-             case BAMBOO_MOSAIC:
-             case BAMBOO_MOSAIC_SLAB:
-             case BAMBOO_MOSAIC_STAIRS:
-+            // Paper start - add missing fuels
-+            case BAMBOO_PLANKS:
-+            case BAMBOO_PRESSURE_PLATE:
-+            case BAMBOO_RAFT:
-+            case BAMBOO_SIGN:
-+            case BAMBOO_SLAB:
-+            case BAMBOO_STAIRS:
-+            case BAMBOO_TRAPDOOR:
-+            // Paper end
-             case BARREL:
-             case BIRCH_BOAT:
-             case BIRCH_BUTTON:
-@@ -7717,6 +7736,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
-             case BIRCH_DOOR:
-             case BIRCH_FENCE:
-             case BIRCH_FENCE_GATE:
-+            case BIRCH_HANGING_SIGN: // Paper
-             case BIRCH_LOG:
-             case BIRCH_PLANKS:
-             case BIRCH_PRESSURE_PLATE:
-@@ -7741,6 +7761,24 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
-             case BROWN_WOOL:
-             case CARTOGRAPHY_TABLE:
-             case CHARCOAL:
-+            // Paper start - add missing isFuels
-+            case CHERRY_BOAT:
-+            case CHERRY_BUTTON:
-+            case CHERRY_CHEST_BOAT:
-+            case CHERRY_DOOR:
-+            case CHERRY_FENCE:
-+            case CHERRY_FENCE_GATE:
-+            case CHERRY_HANGING_SIGN:
-+            case CHERRY_LOG:
-+            case CHERRY_PLANKS:
-+            case CHERRY_PRESSURE_PLATE:
-+            case CHERRY_SAPLING:
-+            case CHERRY_SIGN:
-+            case CHERRY_SLAB:
-+            case CHERRY_STAIRS:
-+            case CHERRY_TRAPDOOR:
-+            case CHERRY_WOOD:
-+            // Paper end
-             case CHEST:
-             case CHISELED_BOOKSHELF:
-             case COAL:
-@@ -7757,6 +7795,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
-             case DARK_OAK_DOOR:
-             case DARK_OAK_FENCE:
-             case DARK_OAK_FENCE_GATE:
-+            case DARK_OAK_HANGING_SIGN: // Paper
-             case DARK_OAK_LOG:
-             case DARK_OAK_PLANKS:
-             case DARK_OAK_PRESSURE_PLATE:
-@@ -7785,6 +7824,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
-             case JUNGLE_DOOR:
-             case JUNGLE_FENCE:
-             case JUNGLE_FENCE_GATE:
-+            case JUNGLE_HANGING_SIGN: // Paper
-             case JUNGLE_LOG:
-             case JUNGLE_PLANKS:
-             case JUNGLE_PRESSURE_PLATE:
-@@ -7816,6 +7856,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
-             case MANGROVE_DOOR:
-             case MANGROVE_FENCE:
-             case MANGROVE_FENCE_GATE:
-+            case MANGROVE_HANGING_SIGN: // Paper
-             case MANGROVE_LOG:
-             case MANGROVE_PLANKS:
-             case MANGROVE_PRESSURE_PLATE:
-@@ -7833,6 +7874,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
-             case OAK_DOOR:
-             case OAK_FENCE:
-             case OAK_FENCE_GATE:
-+            case OAK_HANGING_SIGN: // Paper
-             case OAK_LOG:
-             case OAK_PLANKS:
-             case OAK_PRESSURE_PLATE:
-@@ -7862,6 +7904,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
-             case SPRUCE_DOOR:
-             case SPRUCE_FENCE:
-             case SPRUCE_FENCE_GATE:
-+            case SPRUCE_HANGING_SIGN: // Paper
-             case SPRUCE_LOG:
-             case SPRUCE_PLANKS:
-             case SPRUCE_PRESSURE_PLATE:
-@@ -7874,8 +7917,11 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
-             case STICK:
-             case STRIPPED_ACACIA_LOG:
-             case STRIPPED_ACACIA_WOOD:
-+            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:

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

@@ -1,21 +0,0 @@
-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 d56e1b50dd7da18f40278cec4bfdc9414aae0be1..8228cc9f5005c13964e05fa654c5009c17e0c471 100644
---- a/src/main/java/org/bukkit/block/Biome.java
-+++ b/src/main/java/org/bukkit/block/Biome.java
-@@ -67,6 +67,10 @@ 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/server/0004-Test-changes.patch

@@ -119,18 +119,10 @@ index 0000000000000000000000000000000000000000..8dd0df8c2cc25d37a2590a0787268223
 +    }
 +}
 diff --git a/src/test/java/org/bukkit/support/AbstractTestingBase.java b/src/test/java/org/bukkit/support/AbstractTestingBase.java
-index 5b8a8f79776fe4c070b13f3c79df96ecea619df8..883b2061578032affd9cd5629948054ecf52e40d 100644
+index a85d3606c09717906798f0e1716755d1dae0d760..eab3834dca7cf70468390584156b9a770bfb2a32 100644
 --- a/src/test/java/org/bukkit/support/AbstractTestingBase.java
 +++ b/src/test/java/org/bukkit/support/AbstractTestingBase.java
-@@ -2,7 +2,6 @@ package org.bukkit.support;
- 
- import com.google.common.collect.ImmutableList;
- import com.google.common.util.concurrent.MoreExecutors;
--import java.util.Collections;
- import java.util.List;
- import net.minecraft.SharedConstants;
- import net.minecraft.commands.Commands;
-@@ -49,6 +48,7 @@ public abstract class AbstractTestingBase {
+@@ -53,6 +53,7 @@ public abstract class AbstractTestingBase {
          LayeredRegistryAccess<RegistryLayer> layers = RegistryLayer.createRegistryAccess();
          layers = WorldLoader.loadAndReplaceLayer(resourceManager, layers, RegistryLayer.WORLDGEN, RegistryDataLoader.WORLDGEN_REGISTRIES);
          REGISTRY_CUSTOM = layers.compositeAccess().freeze();
@@ -138,7 +130,7 @@ index 5b8a8f79776fe4c070b13f3c79df96ecea619df8..883b2061578032affd9cd5629948054e
          // Register vanilla pack
          DATA_PACK = ReloadableServerResources.loadResources(resourceManager, REGISTRY_CUSTOM, FeatureFlags.REGISTRY.allFlags(), Commands.CommandSelection.DEDICATED, 0, MoreExecutors.directExecutor(), MoreExecutors.directExecutor()).join();
          // Bind tags
-@@ -56,7 +56,6 @@ public abstract class AbstractTestingBase {
+@@ -60,7 +61,6 @@ public abstract class AbstractTestingBase {
          // Biome shortcut
          BIOMES = REGISTRY_CUSTOM.registryOrThrow(Registries.BIOME);
  

patches/server/0005-Paper-config-files.patch

@@ -4659,10 +4659,10 @@ index 0000000000000000000000000000000000000000..0396589795da1f83ddf62426236dde9a
 +    }
 +}
 diff --git a/src/test/java/org/bukkit/support/AbstractTestingBase.java b/src/test/java/org/bukkit/support/AbstractTestingBase.java
-index 883b2061578032affd9cd5629948054ecf52e40d..5226604f2a88e08d94c59d7eb052edea3621c857 100644
+index eab3834dca7cf70468390584156b9a770bfb2a32..a616624a7beb35239be0fc2bb7fe60db1c673c2d 100644
 --- a/src/test/java/org/bukkit/support/AbstractTestingBase.java
 +++ b/src/test/java/org/bukkit/support/AbstractTestingBase.java
-@@ -57,6 +57,7 @@ public abstract class AbstractTestingBase {
+@@ -62,6 +62,7 @@ public abstract class AbstractTestingBase {
          BIOMES = REGISTRY_CUSTOM.registryOrThrow(Registries.BIOME);
  
          DummyEnchantments.setup();

patches/server/0955-Add-missing-isFuel-Material-entries.patch

@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Sun, 12 Feb 2023 10:52:35 -0800
-Subject: [PATCH] Add missing isFuel Material entries
-
-
-diff --git a/src/test/java/org/bukkit/support/AbstractTestingBase.java b/src/test/java/org/bukkit/support/AbstractTestingBase.java
-index 5226604f2a88e08d94c59d7eb052edea3621c857..75a0b2dac14881c0cc485373d68becee23025902 100644
---- a/src/test/java/org/bukkit/support/AbstractTestingBase.java
-+++ b/src/test/java/org/bukkit/support/AbstractTestingBase.java
-@@ -43,7 +43,12 @@ public abstract class AbstractTestingBase {
-         SharedConstants.tryDetectVersion();
-         Bootstrap.bootStrap();
-         // Set up resource manager
--        MultiPackResourceManager resourceManager = new MultiPackResourceManager(PackType.SERVER_DATA, Collections.singletonList(new ServerPacksSource().getVanillaPack()));
-+        // Paper start - make sure to actually load the packs you add API for
-+        final List<net.minecraft.server.packs.PackResources> packs = new java.util.ArrayList<>();
-+        // don't worry about closing them, the only pack types should be VanillaPackResources (empty close) and PackPackResources (also empty close)
-+        new ServerPacksSource().loadPacks(pack -> packs.add(pack.open()));
-+        final MultiPackResourceManager resourceManager = new MultiPackResourceManager(PackType.SERVER_DATA, packs);
-+        // Paper end
-         // add tags and loot tables for unit tests
-         LayeredRegistryAccess<RegistryLayer> layers = RegistryLayer.createRegistryAccess();
-         layers = WorldLoader.loadAndReplaceLayer(resourceManager, layers, RegistryLayer.WORLDGEN, RegistryDataLoader.WORLDGEN_REGISTRIES);

work/Bukkit

@@ -1 +1 @@
-Subproject commit 02ff2f897afcf6a844f757bdf6fd1a61f7b101b4
+Subproject commit fdef9473fc0cc3873104306f5ec24e587ad3e962

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit e1fc95c506834dfbb12c5adf00764ed5c46a2fca
+Subproject commit 968d28df0410e2a4ff04fbbd09e7c6bf91c3cd69