diff --git a/patches/api/Add-missing-biome-enum.patch b/patches/api/Add-missing-biome-enum.patch deleted file mode 100644 index 3e42dd2be5..0000000000 --- a/patches/api/Add-missing-biome-enum.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jake Potrebic -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, diff --git a/patches/api/Add-missing-isFuel-Material-entries.patch b/patches/api/Add-missing-isFuel-Material-entries.patch deleted file mode 100644 index 308aba4ee4..0000000000 --- a/patches/api/Add-missing-isFuel-Material-entries.patch +++ /dev/null @@ -1,131 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jake Potrebic -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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/org/bukkit/Material.java -+++ b/src/main/java/org/bukkit/Material.java -@@ -0,0 +0,0 @@ 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: -@@ -0,0 +0,0 @@ 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: -@@ -0,0 +0,0 @@ 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: -@@ -0,0 +0,0 @@ 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: -@@ -0,0 +0,0 @@ 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: -@@ -0,0 +0,0 @@ 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: -@@ -0,0 +0,0 @@ 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: -@@ -0,0 +0,0 @@ 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: -@@ -0,0 +0,0 @@ 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: -@@ -0,0 +0,0 @@ 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: diff --git a/patches/api/Mark-experimental-api-as-such.patch b/patches/api/Mark-experimental-api-as-such.patch index 955db23a76..68f0b30b45 100644 --- a/patches/api/Mark-experimental-api-as-such.patch +++ b/patches/api/Mark-experimental-api-as-such.patch @@ -972,6 +972,18 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + @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 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 + 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/block/ChiseledBookshelf.java diff --git a/patches/server/Add-missing-isFuel-Material-entries.patch b/patches/server/Add-missing-isFuel-Material-entries.patch deleted file mode 100644 index 2803461ba6..0000000000 --- a/patches/server/Add-missing-isFuel-Material-entries.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jake Potrebic -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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/test/java/org/bukkit/support/AbstractTestingBase.java -+++ b/src/test/java/org/bukkit/support/AbstractTestingBase.java -@@ -0,0 +0,0 @@ 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 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 layers = RegistryLayer.createRegistryAccess(); - layers = WorldLoader.loadAndReplaceLayer(resourceManager, layers, RegistryLayer.WORLDGEN, RegistryDataLoader.WORLDGEN_REGISTRIES); diff --git a/patches/server/Test-changes.patch b/patches/server/Test-changes.patch index 70fdf44824..1454df7beb 100644 --- a/patches/server/Test-changes.patch +++ b/patches/server/Test-changes.patch @@ -122,14 +122,6 @@ diff --git a/src/test/java/org/bukkit/support/AbstractTestingBase.java b/src/tes index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/test/java/org/bukkit/support/AbstractTestingBase.java +++ b/src/test/java/org/bukkit/support/AbstractTestingBase.java -@@ -0,0 +0,0 @@ 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; @@ -0,0 +0,0 @@ public abstract class AbstractTestingBase { LayeredRegistryAccess layers = RegistryLayer.createRegistryAccess(); layers = WorldLoader.loadAndReplaceLayer(resourceManager, layers, RegistryLayer.WORLDGEN, RegistryDataLoader.WORLDGEN_REGISTRIES); diff --git a/work/Bukkit b/work/Bukkit index 02ff2f897a..fdef9473fc 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 02ff2f897afcf6a844f757bdf6fd1a61f7b101b4 +Subproject commit fdef9473fc0cc3873104306f5ec24e587ad3e962 diff --git a/work/CraftBukkit b/work/CraftBukkit index e1fc95c506..968d28df04 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit e1fc95c506834dfbb12c5adf00764ed5c46a2fca +Subproject commit 968d28df0410e2a4ff04fbbd09e7c6bf91c3cd69