2023-12-21 22:13:05 +01:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
|
|
Date: Sat, 9 Dec 2023 11:47:53 -0800
|
|
|
|
Subject: [PATCH] add missing Experimental annotations
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/FeatureFlag.java b/src/main/java/org/bukkit/FeatureFlag.java
|
2024-06-13 17:45:43 +02:00
|
|
|
index 7522c611b5214dd09867c434d5f7cf161f5c04ca..026b1832bcd163ab89668c991bf002e608e36aef 100644
|
2023-12-21 22:13:05 +01:00
|
|
|
--- a/src/main/java/org/bukkit/FeatureFlag.java
|
|
|
|
+++ b/src/main/java/org/bukkit/FeatureFlag.java
|
2024-04-25 23:21:18 +02:00
|
|
|
@@ -13,6 +13,7 @@ public interface FeatureFlag extends Keyed {
|
|
|
|
|
2023-12-21 22:13:05 +01:00
|
|
|
public static final FeatureFlag VANILLA = Bukkit.getUnsafe().getFeatureFlag(NamespacedKey.minecraft("vanilla"));
|
|
|
|
|
|
|
|
+ @ApiStatus.Experimental // Paper - add missing annotation
|
|
|
|
public static final FeatureFlag BUNDLE = Bukkit.getUnsafe().getFeatureFlag(NamespacedKey.minecraft("bundle"));
|
|
|
|
|
|
|
|
/**
|
2024-06-13 17:45:43 +02:00
|
|
|
@@ -23,6 +24,7 @@ public interface FeatureFlag extends Keyed {
|
2024-04-25 23:21:18 +02:00
|
|
|
@Deprecated
|
2023-12-21 22:13:05 +01:00
|
|
|
public static final FeatureFlag UPDATE_1_20 = Bukkit.getUnsafe().getFeatureFlag(NamespacedKey.minecraft("update_1_20"));
|
|
|
|
|
|
|
|
+ @ApiStatus.Experimental // Paper - add missing annotation
|
|
|
|
public static final FeatureFlag TRADE_REBALANCE = Bukkit.getUnsafe().getFeatureFlag(NamespacedKey.minecraft("trade_rebalance"));
|
|
|
|
|
2024-06-13 17:45:43 +02:00
|
|
|
/**
|
2023-12-21 22:13:05 +01:00
|
|
|
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
|
2024-06-14 13:07:50 +02:00
|
|
|
index c4f067598a40b0381bc9e601a3809e2683c10407..54704da43cf9c429f3914f0580246dde99aa93c0 100644
|
2023-12-21 22:13:05 +01:00
|
|
|
--- a/src/main/java/org/bukkit/Material.java
|
|
|
|
+++ b/src/main/java/org/bukkit/Material.java
|
2024-06-13 17:45:43 +02:00
|
|
|
@@ -2497,6 +2497,8 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
|
2024-04-06 23:51:47 +02:00
|
|
|
EGG(21603, 16),
|
|
|
|
COMPASS(24139),
|
|
|
|
RECOVERY_COMPASS(12710),
|
2024-06-14 13:07:50 +02:00
|
|
|
+ @MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.BUNDLE) // Paper - add missing annotation
|
2024-05-25 23:56:44 +02:00
|
|
|
+ @ApiStatus.Experimental // Paper - add missing annotation
|
2024-04-06 23:51:47 +02:00
|
|
|
BUNDLE(16835, 1),
|
|
|
|
FISHING_ROD(4167, 1, 64),
|
|
|
|
CLOCK(14980),
|
2023-12-21 22:13:05 +01:00
|
|
|
diff --git a/src/main/java/org/bukkit/Sound.java b/src/main/java/org/bukkit/Sound.java
|
2024-06-13 17:45:43 +02:00
|
|
|
index b2ff1da3386223a544ab5fc363a90c66c8869242..8c7b50906fc5b84c5570408f357410810bbfbded 100644
|
2023-12-21 22:13:05 +01:00
|
|
|
--- a/src/main/java/org/bukkit/Sound.java
|
|
|
|
+++ b/src/main/java/org/bukkit/Sound.java
|
2024-06-13 17:45:43 +02:00
|
|
|
@@ -1506,8 +1506,14 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
|
2024-04-27 22:30:15 +02:00
|
|
|
ITEM_BUCKET_FILL_LAVA("item.bucket.fill_lava"),
|
|
|
|
ITEM_BUCKET_FILL_POWDER_SNOW("item.bucket.fill_powder_snow"),
|
|
|
|
ITEM_BUCKET_FILL_TADPOLE("item.bucket.fill_tadpole"),
|
2024-06-13 17:45:43 +02:00
|
|
|
+ @MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.BUNDLE) // Paper - add missing annotation
|
2024-04-27 22:30:15 +02:00
|
|
|
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
|
|
|
ITEM_BUNDLE_DROP_CONTENTS("item.bundle.drop_contents"),
|
2024-06-13 17:45:43 +02:00
|
|
|
+ @MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.BUNDLE) // Paper - add missing annotation
|
2024-04-27 22:30:15 +02:00
|
|
|
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
|
|
|
ITEM_BUNDLE_INSERT("item.bundle.insert"),
|
2024-06-13 17:45:43 +02:00
|
|
|
+ @MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.BUNDLE) // Paper - add missing annotation
|
2024-04-27 22:30:15 +02:00
|
|
|
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
|
|
|
ITEM_BUNDLE_REMOVE_ONE("item.bundle.remove_one"),
|
|
|
|
ITEM_CHORUS_FRUIT_TELEPORT("item.chorus_fruit.teleport"),
|
|
|
|
ITEM_CROP_PLANT("item.crop.plant"),
|
2023-12-21 22:13:05 +01:00
|
|
|
diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java
|
2024-06-14 13:07:50 +02:00
|
|
|
index 8bfec649f7c6dda956bc388a21b489f3565ff384..a303bb1a8d8b5749de5d69d079383e6da2e446d1 100644
|
2023-12-21 22:13:05 +01:00
|
|
|
--- a/src/main/java/org/bukkit/Tag.java
|
|
|
|
+++ b/src/main/java/org/bukkit/Tag.java
|
2024-06-14 13:07:50 +02:00
|
|
|
@@ -1253,6 +1253,7 @@ public interface Tag<T extends Keyed> extends Keyed {
|
2023-12-21 22:13:05 +01:00
|
|
|
/**
|
|
|
|
* Vanilla tag representing entities which can turn in boats.
|
|
|
|
*/
|
2024-05-05 18:00:54 +02:00
|
|
|
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
2023-12-21 22:13:05 +01:00
|
|
|
Tag<EntityType> ENTITY_TYPES_CAN_TURN_IN_BOATS = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("can_turn_in_boats"), EntityType.class);
|
2024-04-23 19:02:08 +02:00
|
|
|
/**
|
|
|
|
* Vanilla tag representing all entities sensitive to illager enchantments.
|
2024-05-26 00:58:56 +02:00
|
|
|
diff --git a/src/main/java/org/bukkit/inventory/meta/BundleMeta.java b/src/main/java/org/bukkit/inventory/meta/BundleMeta.java
|
|
|
|
index e404cd1e2ba44e4c2d09524bc7cf730d8ffbdabd..cea0ebf50876dd32ab7fba6025b30f297d0a69c4 100644
|
|
|
|
--- a/src/main/java/org/bukkit/inventory/meta/BundleMeta.java
|
|
|
|
+++ b/src/main/java/org/bukkit/inventory/meta/BundleMeta.java
|
|
|
|
@@ -6,6 +6,7 @@ import org.jetbrains.annotations.ApiStatus;
|
|
|
|
import org.jetbrains.annotations.NotNull;
|
|
|
|
import org.jetbrains.annotations.Nullable;
|
|
|
|
|
|
|
|
+@org.bukkit.MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.BUNDLE) // Paper - add missing annotation
|
|
|
|
@ApiStatus.Experimental
|
|
|
|
public interface BundleMeta extends ItemMeta {
|
|
|
|
|
2024-05-25 23:56:44 +02:00
|
|
|
diff --git a/src/main/java/org/bukkit/map/MapCursor.java b/src/main/java/org/bukkit/map/MapCursor.java
|
2024-06-14 19:15:52 +02:00
|
|
|
index a17b755da4eca0370680a9777ff3c7de422f5079..aa3b84ef523cd493b89159ed9d81fc19c2285709 100644
|
2024-05-25 23:56:44 +02:00
|
|
|
--- a/src/main/java/org/bukkit/map/MapCursor.java
|
|
|
|
+++ b/src/main/java/org/bukkit/map/MapCursor.java
|
2024-06-14 13:07:50 +02:00
|
|
|
@@ -311,12 +311,25 @@ public final class MapCursor {
|
2024-05-25 23:56:44 +02:00
|
|
|
BANNER_RED(24, "banner_red"),
|
|
|
|
BANNER_BLACK(25, "banner_black"),
|
|
|
|
RED_X(26, "red_x"),
|
|
|
|
+ @org.bukkit.MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.TRADE_REBALANCE) // Paper - add missing annotation
|
|
|
|
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
|
|
|
VILLAGE_DESERT(27, "village_desert"),
|
|
|
|
+ @org.bukkit.MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.TRADE_REBALANCE) // Paper - add missing annotation
|
|
|
|
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
|
|
|
VILLAGE_PLAINS(28, "village_plains"),
|
|
|
|
+ @org.bukkit.MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.TRADE_REBALANCE) // Paper - add missing annotation
|
|
|
|
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
|
|
|
VILLAGE_SAVANNA(29, "village_savanna"),
|
|
|
|
+ @org.bukkit.MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.TRADE_REBALANCE) // Paper - add missing annotation
|
|
|
|
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
|
|
|
VILLAGE_SNOWY(30, "village_snowy"),
|
|
|
|
+ @org.bukkit.MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.TRADE_REBALANCE) // Paper - add missing annotation
|
|
|
|
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
|
|
|
VILLAGE_TAIGA(31, "village_taiga"),
|
|
|
|
+ @org.bukkit.MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.TRADE_REBALANCE) // Paper - add missing annotation
|
|
|
|
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
|
|
|
JUNGLE_TEMPLE(32, "jungle_temple"),
|
|
|
|
+ @org.bukkit.MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.TRADE_REBALANCE) // Paper - add missing annotation
|
|
|
|
SWAMP_HUT(33, "swamp_hut"),
|
|
|
|
TRIAL_CHAMBERS(34, "trial_chambers")
|
|
|
|
;
|