From 1ab1d0f10a4b4967d0d2d2676b7a288938e8edb6 Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Sat, 9 Dec 2023 11:47:53 -0800 Subject: [PATCH] Experimental annotations change --- .../src/main/java/org/bukkit/FeatureFlag.java | 3 +++ paper-api/src/main/java/org/bukkit/GameRule.java | 2 ++ .../src/main/java/org/bukkit/block/Crafter.java | 1 - .../main/java/org/bukkit/block/TrialSpawner.java | 1 - .../src/main/java/org/bukkit/block/Vault.java | 1 - .../java/org/bukkit/entity/AbstractWindCharge.java | 1 - .../src/main/java/org/bukkit/entity/Bogged.java | 1 - .../src/main/java/org/bukkit/entity/Breeze.java | 1 - .../java/org/bukkit/entity/BreezeWindCharge.java | 1 - .../java/org/bukkit/entity/OminousItemSpawner.java | 1 - .../main/java/org/bukkit/entity/WindCharge.java | 1 - .../org/bukkit/event/inventory/InventoryType.java | 1 - .../org/bukkit/inventory/CrafterInventory.java | 1 - .../src/main/java/org/bukkit/map/MapCursor.java | 14 ++++++++++++++ 14 files changed, 19 insertions(+), 11 deletions(-) diff --git a/paper-api/src/main/java/org/bukkit/FeatureFlag.java b/paper-api/src/main/java/org/bukkit/FeatureFlag.java index 54859fc5d8..dd157b650a 100644 --- a/paper-api/src/main/java/org/bukkit/FeatureFlag.java +++ b/paper-api/src/main/java/org/bukkit/FeatureFlag.java @@ -29,6 +29,7 @@ public interface FeatureFlag extends Keyed { @Deprecated(since = "1.20.2") 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")); /** @@ -47,8 +48,10 @@ public interface FeatureFlag extends Keyed { @Deprecated(since = "1.21.4") public static final FeatureFlag WINTER_DROP = Bukkit.getUnsafe().getFeatureFlag(NamespacedKey.minecraft("winter_drop")); + @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")); } diff --git a/paper-api/src/main/java/org/bukkit/GameRule.java b/paper-api/src/main/java/org/bukkit/GameRule.java index 8b6584fae0..89f1820ae9 100644 --- a/paper-api/src/main/java/org/bukkit/GameRule.java +++ b/paper-api/src/main/java/org/bukkit/GameRule.java @@ -287,6 +287,8 @@ public final class GameRule implements net.kyori.adventure.translation.Transl * The maximum speed of minecarts (when the new movement algorithm is * enabled). */ + @MinecraftExperimental(MinecraftExperimental.Requires.MINECART_IMPROVEMENTS) // Paper - add missing annotation + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation public static final GameRule MINECART_MAX_SPEED = new GameRule<>("minecartMaxSpeed", Integer.class); /** diff --git a/paper-api/src/main/java/org/bukkit/block/Crafter.java b/paper-api/src/main/java/org/bukkit/block/Crafter.java index 8d2dd78fc5..f737a2aae3 100644 --- a/paper-api/src/main/java/org/bukkit/block/Crafter.java +++ b/paper-api/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/paper-api/src/main/java/org/bukkit/block/TrialSpawner.java b/paper-api/src/main/java/org/bukkit/block/TrialSpawner.java index 2d46d85aff..6fc7b5fe11 100644 --- a/paper-api/src/main/java/org/bukkit/block/TrialSpawner.java +++ b/paper-api/src/main/java/org/bukkit/block/TrialSpawner.java @@ -10,7 +10,6 @@ import org.jetbrains.annotations.NotNull; /** * Represents a captured state of a trial spawner. */ -@ApiStatus.Experimental public interface TrialSpawner extends TileState { /** diff --git a/paper-api/src/main/java/org/bukkit/block/Vault.java b/paper-api/src/main/java/org/bukkit/block/Vault.java index f0c5d27f6f..375f41fe4a 100644 --- a/paper-api/src/main/java/org/bukkit/block/Vault.java +++ b/paper-api/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/paper-api/src/main/java/org/bukkit/entity/AbstractWindCharge.java b/paper-api/src/main/java/org/bukkit/entity/AbstractWindCharge.java index 60fbacee26..ecff691c3a 100644 --- a/paper-api/src/main/java/org/bukkit/entity/AbstractWindCharge.java +++ b/paper-api/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/paper-api/src/main/java/org/bukkit/entity/Bogged.java b/paper-api/src/main/java/org/bukkit/entity/Bogged.java index 6093b1dad8..c84ddf808e 100644 --- a/paper-api/src/main/java/org/bukkit/entity/Bogged.java +++ b/paper-api/src/main/java/org/bukkit/entity/Bogged.java @@ -5,7 +5,6 @@ import org.jetbrains.annotations.ApiStatus; /** * Represents a Bogged Skeleton. */ -@ApiStatus.Experimental public interface Bogged extends AbstractSkeleton, Shearable, io.papermc.paper.entity.Shearable { // Paper - Shear API /** diff --git a/paper-api/src/main/java/org/bukkit/entity/Breeze.java b/paper-api/src/main/java/org/bukkit/entity/Breeze.java index a75e725805..254bc6e189 100644 --- a/paper-api/src/main/java/org/bukkit/entity/Breeze.java +++ b/paper-api/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/paper-api/src/main/java/org/bukkit/entity/BreezeWindCharge.java b/paper-api/src/main/java/org/bukkit/entity/BreezeWindCharge.java index 06ca3dc4b0..748e58eb93 100644 --- a/paper-api/src/main/java/org/bukkit/entity/BreezeWindCharge.java +++ b/paper-api/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/paper-api/src/main/java/org/bukkit/entity/OminousItemSpawner.java b/paper-api/src/main/java/org/bukkit/entity/OminousItemSpawner.java index 4aa07d4edb..dbd4da4c63 100644 --- a/paper-api/src/main/java/org/bukkit/entity/OminousItemSpawner.java +++ b/paper-api/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/paper-api/src/main/java/org/bukkit/entity/WindCharge.java b/paper-api/src/main/java/org/bukkit/entity/WindCharge.java index 4adc91ba3d..beb6242649 100644 --- a/paper-api/src/main/java/org/bukkit/entity/WindCharge.java +++ b/paper-api/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/paper-api/src/main/java/org/bukkit/event/inventory/InventoryType.java b/paper-api/src/main/java/org/bukkit/event/inventory/InventoryType.java index 06e037ce94..e0d73d432c 100644 --- a/paper-api/src/main/java/org/bukkit/event/inventory/InventoryType.java +++ b/paper-api/src/main/java/org/bukkit/event/inventory/InventoryType.java @@ -148,7 +148,6 @@ public enum InventoryType { /** * A crafter inventory, with 9 CRAFTING slots. */ - @ApiStatus.Experimental CRAFTER(9, "Crafter", MenuType.CRAFTER_3X3), /** * The new smithing inventory, with 3 CRAFTING slots and 1 RESULT slot. diff --git a/paper-api/src/main/java/org/bukkit/inventory/CrafterInventory.java b/paper-api/src/main/java/org/bukkit/inventory/CrafterInventory.java index bb1fb5e051..49d0a37bbe 100644 --- a/paper-api/src/main/java/org/bukkit/inventory/CrafterInventory.java +++ b/paper-api/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 { } diff --git a/paper-api/src/main/java/org/bukkit/map/MapCursor.java b/paper-api/src/main/java/org/bukkit/map/MapCursor.java index bd1c0417fb..8d00f58883 100644 --- a/paper-api/src/main/java/org/bukkit/map/MapCursor.java +++ b/paper-api/src/main/java/org/bukkit/map/MapCursor.java @@ -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"); + @org.bukkit.MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.TRADE_REBALANCE) // Paper - add missing annotation + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation Type VILLAGE_DESERT = getType("village_desert"); + @org.bukkit.MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.TRADE_REBALANCE) // Paper - add missing annotation + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation Type VILLAGE_PLAINS = getType("village_plains"); + @org.bukkit.MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.TRADE_REBALANCE) // Paper - add missing annotation + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation Type VILLAGE_SAVANNA = getType("village_savanna"); + @org.bukkit.MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.TRADE_REBALANCE) // Paper - add missing annotation + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation Type VILLAGE_SNOWY = getType("village_snowy"); + @org.bukkit.MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.TRADE_REBALANCE) // Paper - add missing annotation + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation Type VILLAGE_TAIGA = getType("village_taiga"); + @org.bukkit.MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.TRADE_REBALANCE) // Paper - add missing annotation + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation Type JUNGLE_TEMPLE = getType("jungle_temple"); + @org.bukkit.MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.TRADE_REBALANCE) // Paper - add missing annotation + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation Type SWAMP_HUT = getType("swamp_hut"); Type TRIAL_CHAMBERS = getType("trial_chambers");