OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-28 07:20:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

make MenuType implement FeatureDependant

Browse source
This commit is contained in:
Jake Potrebic 2024-09-23 15:03:52 -07:00
parent f137f3cf13
commit 660700a1d3
3 changed files with 31 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
patches/api/Add-FeatureFlag-API.patch
View file

@ -313,6 +313,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
boolean isEnabledByFeature(@NotNull World world); 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/inventory/MenuType.java
+++ b/src/main/java/org/bukkit/inventory/MenuType.java
@@ -0,0 +0,0 @@ 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 diff --git a/src/main/java/org/bukkit/potion/PotionEffectType.java b/src/main/java/org/bukkit/potion/PotionEffectType.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/potion/PotionEffectType.java --- a/src/main/java/org/bukkit/potion/PotionEffectType.java

5
patches/api/Introduce-registry-entry-and-builders.patch
View file

@ -370,12 +370,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+import io.papermc.paper.registry.RegistryBuilder; +import io.papermc.paper.registry.RegistryBuilder;
+import org.bukkit.GameEvent; +import org.bukkit.GameEvent;
+import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.Range; +import org.jetbrains.annotations.Range;
+ +
+/** +/**
+ * A data-centric version-specific registry entry for the {@link GameEvent} type. + * A data-centric version-specific registry entry for the {@link GameEvent} type.
+ */ + */
+@ApiStatus.Experimental
+@ApiStatus.NonExtendable
+public interface GameEventRegistryEntry { +public interface GameEventRegistryEntry {
+ +
+ /** + /**
@ -394,6 +397,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ * <li>{@link #range(int)}</li> + * <li>{@link #range(int)}</li>
+ * </ul> + * </ul>
+ */ + */
+ @ApiStatus.Experimental
+ @ApiStatus.NonExtendable
+ interface Builder extends GameEventRegistryEntry, RegistryBuilder<GameEvent> { + interface Builder extends GameEventRegistryEntry, RegistryBuilder<GameEvent> {
+ +
+ /** + /**

14
patches/server/Add-FeatureFlag-API.patch
View file

@ -233,6 +233,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
private final NamespacedKey key; private final NamespacedKey key;
private final Item item; private final Item item;
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMenuType.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMenuType.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMenuType.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMenuType.java
@@ -0,0 +0,0 @@ import org.bukkit.entity.HumanEntity;
import org.bukkit.inventory.InventoryView;
import org.bukkit.inventory.MenuType;
-public class CraftMenuType<V extends InventoryView> implements MenuType.Typed<V>, Handleable<net.minecraft.world.inventory.MenuType<?>> {
+public class CraftMenuType<V extends InventoryView> implements MenuType.Typed<V>, Handleable<net.minecraft.world.inventory.MenuType<?>>, io.papermc.paper.world.flag.PaperFeatureDependent { // Paper - make FeatureDependant
private final NamespacedKey key;
private final net.minecraft.world.inventory.MenuType<?> handle;
diff --git a/src/main/java/org/bukkit/craftbukkit/packs/CraftDataPack.java b/src/main/java/org/bukkit/craftbukkit/packs/CraftDataPack.java diff --git a/src/main/java/org/bukkit/craftbukkit/packs/CraftDataPack.java b/src/main/java/org/bukkit/craftbukkit/packs/CraftDataPack.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/packs/CraftDataPack.java --- a/src/main/java/org/bukkit/craftbukkit/packs/CraftDataPack.java
@ -380,7 +393,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ static Set<RegistryKey<?>> featureFilteredRegistries() { + static Set<RegistryKey<?>> featureFilteredRegistries() {
+ final Set<RegistryKey<?>> registryKeys = new HashSet<>(); + final Set<RegistryKey<?>> registryKeys = new HashSet<>();
+ for (final ResourceKey filteredRegistry : FeatureElement.FILTERED_REGISTRIES) { + for (final ResourceKey filteredRegistry : FeatureElement.FILTERED_REGISTRIES) {
+ if (filteredRegistry == Registries.MENU) continue; // not applicable atm
+ registryKeys.add(PaperRegistries.registryFromNms(filteredRegistry)); + registryKeys.add(PaperRegistries.registryFromNms(filteredRegistry));
+ } + }
+ return registryKeys; + return registryKeys;