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
|
2024-06-20 18:03:09 +02:00
|
|
|
Subject: [PATCH] Experimental annotations change
|
2023-12-21 22:13:05 +01:00
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/FeatureFlag.java b/src/main/java/org/bukkit/FeatureFlag.java
|
2024-10-22 18:23:19 +02:00
|
|
|
index 710f8e6242eab7b638e4f42e4e9790007f4c67b7..82f9ba32256bfc1125ee970a7fed0895fe08f145 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-10-22 18:23:19 +02:00
|
|
|
@@ -29,6 +29,7 @@ public interface FeatureFlag extends Keyed {
|
|
|
|
@Deprecated
|
|
|
|
public static final FeatureFlag UPDATE_1_20 = Bukkit.getUnsafe().getFeatureFlag(NamespacedKey.minecraft("update_1_20"));
|
2023-12-21 22:13:05 +01:00
|
|
|
|
|
|
|
+ @ApiStatus.Experimental // Paper - add missing annotation
|
2024-10-22 18:23:19 +02:00
|
|
|
public static final FeatureFlag TRADE_REBALANCE = Bukkit.getUnsafe().getFeatureFlag(NamespacedKey.minecraft("trade_rebalance"));
|
2023-12-21 22:13:05 +01:00
|
|
|
|
|
|
|
/**
|
2024-10-22 18:23:19 +02:00
|
|
|
@@ -39,10 +40,13 @@ public interface FeatureFlag extends Keyed {
|
2024-04-25 23:21:18 +02:00
|
|
|
@Deprecated
|
2024-10-22 18:23:19 +02:00
|
|
|
public static final FeatureFlag UPDATE_121 = Bukkit.getUnsafe().getFeatureFlag(NamespacedKey.minecraft("update_1_21"));
|
2023-12-21 22:13:05 +01:00
|
|
|
|
|
|
|
+ @ApiStatus.Experimental // Paper - add missing annotation
|
2024-10-22 18:23:19 +02:00
|
|
|
public static final FeatureFlag WINTER_DROP = Bukkit.getUnsafe().getFeatureFlag(NamespacedKey.minecraft("winter_drop"));
|
2023-12-21 22:13:05 +01:00
|
|
|
|
2024-10-22 18:23:19 +02:00
|
|
|
+ @ApiStatus.Experimental // Paper - add missing annotation
|
|
|
|
public static final FeatureFlag REDSTONE_EXPERIMENTS = Bukkit.getUnsafe().getFeatureFlag(NamespacedKey.minecraft("redstone_experiments"));
|
|
|
|
|
|
|
|
+ @ApiStatus.Experimental // Paper - add missing annotation
|
|
|
|
public static final FeatureFlag MINECART_IMPROVEMENTS = Bukkit.getUnsafe().getFeatureFlag(NamespacedKey.minecraft("minecart_improvements"));
|
|
|
|
|
|
|
|
}
|
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-10-22 18:23:19 +02:00
|
|
|
index 615eb24ffdd8f6d55ccd4f21760b809c1098bc68..f4ccb19107464e92744fbf66d55bf81fd50dfcc3 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-10-22 18:23:19 +02:00
|
|
|
@@ -2631,6 +2631,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),
|
2024-10-22 18:23:19 +02:00
|
|
|
WHITE_BUNDLE(12072, 1),
|
|
|
|
ORANGE_BUNDLE(18288, 1),
|
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-10-22 18:32:41 +02:00
|
|
|
index cf17af024b1953b6f21f18885411ea6a0baa1d4c..2f951b0aa7e383a89e3e4244ffcae4e1b3a108e7 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-10-22 18:32:41 +02:00
|
|
|
@@ -1530,9 +1530,17 @@ 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-10-22 18:32:41 +02:00
|
|
|
+ @MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.BUNDLE) // Paper - add missing annotation
|
|
|
|
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
2024-10-22 18:23:19 +02:00
|
|
|
ITEM_BUNDLE_INSERT_FAIL("item.bundle.insert_fail"),
|
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"),
|
2024-06-20 18:03:09 +02:00
|
|
|
diff --git a/src/main/java/org/bukkit/block/Crafter.java b/src/main/java/org/bukkit/block/Crafter.java
|
|
|
|
index 8d2dd78fc588a6817dfede8040b9909a7d5bde67..f737a2aae3f57a1bfe4cf68ea66f603da4eebd47 100644
|
|
|
|
--- a/src/main/java/org/bukkit/block/Crafter.java
|
|
|
|
+++ b/src/main/java/org/bukkit/block/Crafter.java
|
|
|
|
@@ -6,7 +6,6 @@ import org.jetbrains.annotations.ApiStatus;
|
|
|
|
/**
|
|
|
|
* Represents a captured state of a crafter.
|
|
|
|
*/
|
|
|
|
-@ApiStatus.Experimental
|
|
|
|
public interface Crafter extends Container, com.destroystokyo.paper.loottable.LootableBlockInventory { // Paper - LootTable API
|
|
|
|
|
|
|
|
/**
|
|
|
|
diff --git a/src/main/java/org/bukkit/block/TrialSpawner.java b/src/main/java/org/bukkit/block/TrialSpawner.java
|
2024-07-06 21:19:14 +02:00
|
|
|
index 2d46d85aff243e9b3c6764f0de041fff6b766853..6fc7b5fe1152f739663a4715a1c93246c3ee6df2 100644
|
2024-06-20 18:03:09 +02:00
|
|
|
--- a/src/main/java/org/bukkit/block/TrialSpawner.java
|
|
|
|
+++ b/src/main/java/org/bukkit/block/TrialSpawner.java
|
2024-07-06 21:19:14 +02:00
|
|
|
@@ -10,7 +10,6 @@ import org.jetbrains.annotations.NotNull;
|
2024-06-20 18:03:09 +02:00
|
|
|
/**
|
|
|
|
* Represents a captured state of a trial spawner.
|
|
|
|
*/
|
|
|
|
-@ApiStatus.Experimental
|
|
|
|
public interface TrialSpawner extends TileState {
|
2024-07-06 21:19:14 +02:00
|
|
|
|
|
|
|
/**
|
2024-06-20 18:03:09 +02:00
|
|
|
diff --git a/src/main/java/org/bukkit/block/Vault.java b/src/main/java/org/bukkit/block/Vault.java
|
|
|
|
index f0c5d27f6f1ff56ffe4b88dfdce8d0b7f06d19e1..375f41fe4aebdbf140497b5ba1e54e1c72f0cdfc 100644
|
|
|
|
--- a/src/main/java/org/bukkit/block/Vault.java
|
|
|
|
+++ b/src/main/java/org/bukkit/block/Vault.java
|
|
|
|
@@ -5,6 +5,5 @@ import org.jetbrains.annotations.ApiStatus;
|
|
|
|
/**
|
|
|
|
* Represents a captured state of a trial spawner.
|
|
|
|
*/
|
|
|
|
-@ApiStatus.Experimental
|
|
|
|
public interface Vault extends TileState {
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/AbstractWindCharge.java b/src/main/java/org/bukkit/entity/AbstractWindCharge.java
|
|
|
|
index 60fbacee263e55f91ac977f020e390d46024723a..ecff691c3a0878659fb051926ef769ce1e339c48 100644
|
|
|
|
--- a/src/main/java/org/bukkit/entity/AbstractWindCharge.java
|
|
|
|
+++ b/src/main/java/org/bukkit/entity/AbstractWindCharge.java
|
|
|
|
@@ -5,7 +5,6 @@ import org.jetbrains.annotations.ApiStatus;
|
|
|
|
/**
|
|
|
|
* Represents a Wind Charge.
|
|
|
|
*/
|
|
|
|
-@ApiStatus.Experimental
|
|
|
|
public interface AbstractWindCharge extends Fireball {
|
|
|
|
|
|
|
|
/**
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/Bogged.java b/src/main/java/org/bukkit/entity/Bogged.java
|
2024-08-09 22:05:50 +02:00
|
|
|
index 6296a6f3f3e794677fd3a626376f357c740ec356..7d993f8bd18ec1d3260d12f0ff8078a86ee4867d 100644
|
2024-06-20 18:03:09 +02:00
|
|
|
--- a/src/main/java/org/bukkit/entity/Bogged.java
|
|
|
|
+++ b/src/main/java/org/bukkit/entity/Bogged.java
|
|
|
|
@@ -5,6 +5,5 @@ import org.jetbrains.annotations.ApiStatus;
|
|
|
|
/**
|
|
|
|
* Represents a Bogged Skeleton.
|
|
|
|
*/
|
|
|
|
-@ApiStatus.Experimental
|
2024-08-09 22:05:50 +02:00
|
|
|
public interface Bogged extends AbstractSkeleton, Shearable, io.papermc.paper.entity.Shearable { // Paper - Shear API
|
2024-06-20 18:03:09 +02:00
|
|
|
}
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/Breeze.java b/src/main/java/org/bukkit/entity/Breeze.java
|
|
|
|
index a75e725805c193a408683885cba83ca168347165..254bc6e18961a72f471334cc0535e3c7a9d70012 100644
|
|
|
|
--- a/src/main/java/org/bukkit/entity/Breeze.java
|
|
|
|
+++ b/src/main/java/org/bukkit/entity/Breeze.java
|
|
|
|
@@ -5,6 +5,5 @@ import org.jetbrains.annotations.ApiStatus;
|
|
|
|
/**
|
|
|
|
* Represents a Breeze. Whoosh!
|
|
|
|
*/
|
|
|
|
-@ApiStatus.Experimental
|
|
|
|
public interface Breeze extends Monster {
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/BreezeWindCharge.java b/src/main/java/org/bukkit/entity/BreezeWindCharge.java
|
|
|
|
index 06ca3dc4b0b69cbaefa96464dce484cea93e0717..748e58eb93c7882e15d9cbdd56d11bb14808698b 100644
|
|
|
|
--- a/src/main/java/org/bukkit/entity/BreezeWindCharge.java
|
|
|
|
+++ b/src/main/java/org/bukkit/entity/BreezeWindCharge.java
|
|
|
|
@@ -5,7 +5,6 @@ import org.jetbrains.annotations.ApiStatus;
|
|
|
|
/**
|
|
|
|
* Represents a Wind Charge.
|
|
|
|
*/
|
|
|
|
-@ApiStatus.Experimental
|
|
|
|
public interface BreezeWindCharge extends AbstractWindCharge {
|
|
|
|
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/OminousItemSpawner.java b/src/main/java/org/bukkit/entity/OminousItemSpawner.java
|
2024-06-24 00:42:44 +02:00
|
|
|
index 4aa07d4edb2c81d0ae7999b30ad53ff8bb884ec7..dbd4da4c63b6b1b21c3e638ac4d2c9fdd6716a8e 100644
|
2024-06-20 18:03:09 +02:00
|
|
|
--- a/src/main/java/org/bukkit/entity/OminousItemSpawner.java
|
|
|
|
+++ b/src/main/java/org/bukkit/entity/OminousItemSpawner.java
|
|
|
|
@@ -7,7 +7,6 @@ import org.jetbrains.annotations.Nullable;
|
|
|
|
/**
|
|
|
|
* Represents an ominous item spawner.
|
|
|
|
*/
|
|
|
|
-@ApiStatus.Experimental
|
|
|
|
public interface OminousItemSpawner extends Entity {
|
|
|
|
|
|
|
|
/**
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/WindCharge.java b/src/main/java/org/bukkit/entity/WindCharge.java
|
|
|
|
index 4adc91ba3dff00ab44303778e9d4499f7808ad00..beb62426490a361af793fb530106d8547a83ae03 100644
|
|
|
|
--- a/src/main/java/org/bukkit/entity/WindCharge.java
|
|
|
|
+++ b/src/main/java/org/bukkit/entity/WindCharge.java
|
|
|
|
@@ -5,7 +5,6 @@ import org.jetbrains.annotations.ApiStatus;
|
|
|
|
/**
|
|
|
|
* Represents a Wind Charge.
|
|
|
|
*/
|
|
|
|
-@ApiStatus.Experimental
|
|
|
|
public interface WindCharge extends AbstractWindCharge {
|
|
|
|
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/org/bukkit/event/inventory/InventoryType.java b/src/main/java/org/bukkit/event/inventory/InventoryType.java
|
2024-09-15 21:39:53 +02:00
|
|
|
index ae4ae1fa6d407665ef03edcdef683d741668acf1..b4fe8108e8b36b8ce859cdd4a5b557034f923c85 100644
|
2024-06-20 18:03:09 +02:00
|
|
|
--- a/src/main/java/org/bukkit/event/inventory/InventoryType.java
|
|
|
|
+++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java
|
2024-09-15 21:39:53 +02:00
|
|
|
@@ -148,7 +148,6 @@ public enum InventoryType {
|
2024-06-20 18:03:09 +02:00
|
|
|
/**
|
|
|
|
* A crafter inventory, with 9 CRAFTING slots.
|
|
|
|
*/
|
|
|
|
- @ApiStatus.Experimental
|
2024-09-15 21:39:53 +02:00
|
|
|
CRAFTER(9, "Crafter", MenuType.CRAFTER_3X3),
|
2024-06-20 18:03:09 +02:00
|
|
|
/**
|
|
|
|
* The new smithing inventory, with 3 CRAFTING slots and 1 RESULT slot.
|
|
|
|
diff --git a/src/main/java/org/bukkit/inventory/CrafterInventory.java b/src/main/java/org/bukkit/inventory/CrafterInventory.java
|
|
|
|
index bb1fb5e0518c6a62ef8b206733ee51d831f1f85b..49d0a37bbeb0b8fa9207164c74245ef05485467c 100644
|
|
|
|
--- a/src/main/java/org/bukkit/inventory/CrafterInventory.java
|
|
|
|
+++ b/src/main/java/org/bukkit/inventory/CrafterInventory.java
|
|
|
|
@@ -5,5 +5,4 @@ import org.jetbrains.annotations.ApiStatus;
|
|
|
|
/**
|
|
|
|
* Interface to the inventory of a Crafter.
|
|
|
|
*/
|
|
|
|
-@ApiStatus.Experimental
|
|
|
|
public interface CrafterInventory extends Inventory { }
|
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-10-21 00:06:54 +02:00
|
|
|
index 0899981b9ab1f98dacc617156d12779421e4c275..6c33fbf720a2e11655e254aeb516e08831c2adf4 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-07-18 10:13:20 +02:00
|
|
|
@@ -314,12 +314,26 @@ public final class MapCursor {
|
|
|
|
Type BANNER_RED = getType("banner_red");
|
|
|
|
Type BANNER_BLACK = getType("banner_black");
|
|
|
|
Type RED_X = getType("red_x");
|
2024-05-25 23:56:44 +02:00
|
|
|
+ @org.bukkit.MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.TRADE_REBALANCE) // Paper - add missing annotation
|
|
|
|
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
2024-07-18 10:13:20 +02:00
|
|
|
Type VILLAGE_DESERT = getType("village_desert");
|
2024-05-25 23:56:44 +02:00
|
|
|
+ @org.bukkit.MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.TRADE_REBALANCE) // Paper - add missing annotation
|
|
|
|
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
2024-07-18 10:13:20 +02:00
|
|
|
Type VILLAGE_PLAINS = getType("village_plains");
|
2024-05-25 23:56:44 +02:00
|
|
|
+ @org.bukkit.MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.TRADE_REBALANCE) // Paper - add missing annotation
|
|
|
|
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
2024-07-18 10:13:20 +02:00
|
|
|
Type VILLAGE_SAVANNA = getType("village_savanna");
|
2024-05-25 23:56:44 +02:00
|
|
|
+ @org.bukkit.MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.TRADE_REBALANCE) // Paper - add missing annotation
|
|
|
|
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
2024-07-18 10:13:20 +02:00
|
|
|
Type VILLAGE_SNOWY = getType("village_snowy");
|
2024-05-25 23:56:44 +02:00
|
|
|
+ @org.bukkit.MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.TRADE_REBALANCE) // Paper - add missing annotation
|
|
|
|
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
2024-07-18 10:13:20 +02:00
|
|
|
Type VILLAGE_TAIGA = getType("village_taiga");
|
2024-05-25 23:56:44 +02:00
|
|
|
+ @org.bukkit.MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.TRADE_REBALANCE) // Paper - add missing annotation
|
|
|
|
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
2024-07-18 10:13:20 +02:00
|
|
|
Type JUNGLE_TEMPLE = getType("jungle_temple");
|
2024-05-25 23:56:44 +02:00
|
|
|
+ @org.bukkit.MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.TRADE_REBALANCE) // Paper - add missing annotation
|
2024-06-20 18:03:09 +02:00
|
|
|
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
2024-07-18 10:13:20 +02:00
|
|
|
Type SWAMP_HUT = getType("swamp_hut");
|
|
|
|
Type TRIAL_CHAMBERS = getType("trial_chambers");
|
|
|
|
|