make MenuType implement FeatureDependant

patches/api/0474-Introduce-registry-entry-and-builders.patch

@@ -361,21 +361,24 @@ index 0000000000000000000000000000000000000000..6c7d8b98103909428bb4dcf14825fe18
 +}
 diff --git a/src/main/java/io/papermc/paper/registry/data/GameEventRegistryEntry.java b/src/main/java/io/papermc/paper/registry/data/GameEventRegistryEntry.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..27b4da08168c7b341b776635011ff4022a12d361
+index 0000000000000000000000000000000000000000..a59620816f8795fc0e585f969741d1940340673a
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/registry/data/GameEventRegistryEntry.java
-@@ -0,0 +1,43 @@
+@@ -0,0 +1,48 @@
 +package io.papermc.paper.registry.data;
 +
 +import io.papermc.paper.registry.RegistryBuilder;
 +import org.bukkit.GameEvent;
 +import org.checkerframework.checker.nullness.qual.NonNull;
++import org.jetbrains.annotations.ApiStatus;
 +import org.jetbrains.annotations.Contract;
 +import org.jetbrains.annotations.Range;
 +
 +/**
 + * A data-centric version-specific registry entry for the {@link GameEvent} type.
 + */
++@ApiStatus.Experimental
++@ApiStatus.NonExtendable
 +public interface GameEventRegistryEntry {
 +
 +    /**
@@ -394,6 +397,8 @@ index 0000000000000000000000000000000000000000..27b4da08168c7b341b776635011ff402
 +     *     <li>{@link #range(int)}</li>
 +     * </ul>
 +     */
++    @ApiStatus.Experimental
++    @ApiStatus.NonExtendable
 +    interface Builder extends GameEventRegistryEntry, RegistryBuilder<GameEvent> {
 +
 +        /**

patches/api/0486-Add-FeatureFlag-API.patch

@@ -313,6 +313,19 @@ index 0168f0a14a3e899e84c5e36963ff79950ab580fb..5b4449f63595193efcd1329b9df0558c
      boolean isEnabledByFeature(@NotNull World world);
  
      /**
+diff --git a/src/main/java/org/bukkit/inventory/MenuType.java b/src/main/java/org/bukkit/inventory/MenuType.java
+index 29dfad691cbdd09d043f6171defc8a7fabbc2b75..5ddc24df90c3a4b9f92a49437e1aa90e3961daf3 100644
+--- a/src/main/java/org/bukkit/inventory/MenuType.java
++++ b/src/main/java/org/bukkit/inventory/MenuType.java
+@@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull;
+  * created and viewed by the player.
+  */
+ @ApiStatus.Experimental
+-public interface MenuType extends Keyed {
++public interface MenuType extends Keyed, io.papermc.paper.world.flag.FeatureDependant { // Paper - make FeatureDependant
+ 
+     /**
+      * A MenuType which represents a chest with 1 row.
 diff --git a/src/main/java/org/bukkit/potion/PotionEffectType.java b/src/main/java/org/bukkit/potion/PotionEffectType.java
 index 10fa51d116b40450b51af9110d5637f3505ebf65..647452f16e4bf7e5a61520123e62d9408ec9adfb 100644
 --- a/src/main/java/org/bukkit/potion/PotionEffectType.java