Remap CraftBukkit to Mojang+Yarn Mappings

By: Initial Source <noreply+automated@papermc.io>

paper-server/patches/sources/net/minecraft/advancements/AdvancementHolder.java.patch

@@ -1,18 +1,17 @@
 --- a/net/minecraft/advancements/AdvancementHolder.java
 +++ b/net/minecraft/advancements/AdvancementHolder.java
-@@ -6,6 +6,11 @@
+@@ -5,6 +5,10 @@
+ import net.minecraft.network.codec.ByteBufCodecs;
  import net.minecraft.network.codec.StreamCodec;
- import net.minecraft.resources.MinecraftKey;
- 
+ import net.minecraft.resources.ResourceLocation;
 +// CraftBukkit start
 +import org.bukkit.craftbukkit.advancement.CraftAdvancement;
 +import org.bukkit.craftbukkit.util.CraftNamespacedKey;
 +// CraftBukkit end
-+
- public record AdvancementHolder(MinecraftKey id, Advancement value) {
  
-     public static final StreamCodec<RegistryFriendlyByteBuf, AdvancementHolder> STREAM_CODEC = StreamCodec.composite(MinecraftKey.STREAM_CODEC, AdvancementHolder::id, Advancement.STREAM_CODEC, AdvancementHolder::value, AdvancementHolder::new);
-@@ -38,4 +43,10 @@
+ public record AdvancementHolder(ResourceLocation id, Advancement value) {
+ 
+@@ -38,4 +42,10 @@
      public String toString() {
          return this.id.toString();
      }

paper-server/patches/sources/net/minecraft/advancements/AdvancementTree.java.patch

@@ -8,4 +8,4 @@
 +        // AdvancementTree.LOGGER.info("Loaded {} advancements", this.nodes.size()); // CraftBukkit - moved to AdvancementDataWorld#reload
      }
  
-     private boolean tryInsert(AdvancementHolder advancementholder) {
+     private boolean tryInsert(AdvancementHolder advancement) {