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
|
|
|
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
|
|
--- a/src/main/java/org/bukkit/FeatureFlag.java
|
|
|
|
+++ b/src/main/java/org/bukkit/FeatureFlag.java
|
|
|
|
@@ -0,0 +0,0 @@ public interface FeatureFlag extends Keyed {
|
2024-04-25 23:21:18 +02:00
|
|
|
|
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"));
|
|
|
|
|
|
|
|
/**
|
|
|
|
@@ -0,0 +0,0 @@ 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
|
|
|
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
|
|
--- a/src/main/java/org/bukkit/Material.java
|
|
|
|
+++ b/src/main/java/org/bukkit/Material.java
|
2024-04-06 23:51:47 +02:00
|
|
|
@@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
|
|
|
|
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
|
|
|
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
|
|
--- a/src/main/java/org/bukkit/Sound.java
|
|
|
|
+++ b/src/main/java/org/bukkit/Sound.java
|
2024-04-27 22:30:15 +02:00
|
|
|
@@ -0,0 +0,0 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
|
|
|
|
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"),
|
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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
|
|
--- a/src/main/java/org/bukkit/block/Crafter.java
|
|
|
|
+++ b/src/main/java/org/bukkit/block/Crafter.java
|
|
|
|
@@ -0,0 +0,0 @@ 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
|
|
|
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
|
|
--- 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
|
|
|
@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
|
|
--- a/src/main/java/org/bukkit/block/Vault.java
|
|
|
|
+++ b/src/main/java/org/bukkit/block/Vault.java
|
|
|
|
@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
|
|
--- a/src/main/java/org/bukkit/entity/AbstractWindCharge.java
|
|
|
|
+++ b/src/main/java/org/bukkit/entity/AbstractWindCharge.java
|
|
|
|
@@ -0,0 +0,0 @@ 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
|
|
|
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
|
|
--- a/src/main/java/org/bukkit/entity/Bogged.java
|
|
|
|
+++ b/src/main/java/org/bukkit/entity/Bogged.java
|
|
|
|
@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
|
|
--- a/src/main/java/org/bukkit/entity/Breeze.java
|
|
|
|
+++ b/src/main/java/org/bukkit/entity/Breeze.java
|
|
|
|
@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
|
|
--- a/src/main/java/org/bukkit/entity/BreezeWindCharge.java
|
|
|
|
+++ b/src/main/java/org/bukkit/entity/BreezeWindCharge.java
|
|
|
|
@@ -0,0 +0,0 @@ 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
|
|
|
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
|
|
--- a/src/main/java/org/bukkit/entity/OminousItemSpawner.java
|
|
|
|
+++ b/src/main/java/org/bukkit/entity/OminousItemSpawner.java
|
|
|
|
@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
|
|
--- a/src/main/java/org/bukkit/entity/WindCharge.java
|
|
|
|
+++ b/src/main/java/org/bukkit/entity/WindCharge.java
|
|
|
|
@@ -0,0 +0,0 @@ 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
|
|
|
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
|
|
--- a/src/main/java/org/bukkit/event/inventory/InventoryType.java
|
|
|
|
+++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java
|
|
|
|
@@ -0,0 +0,0 @@ public enum InventoryType {
|
|
|
|
/**
|
|
|
|
* A crafter inventory, with 9 CRAFTING slots.
|
|
|
|
*/
|
|
|
|
- @ApiStatus.Experimental
|
|
|
|
CRAFTER(9, "Crafter"),
|
|
|
|
/**
|
|
|
|
* 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
|
|
--- a/src/main/java/org/bukkit/inventory/CrafterInventory.java
|
|
|
|
+++ b/src/main/java/org/bukkit/inventory/CrafterInventory.java
|
|
|
|
@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
|
|
--- a/src/main/java/org/bukkit/inventory/meta/BundleMeta.java
|
|
|
|
+++ b/src/main/java/org/bukkit/inventory/meta/BundleMeta.java
|
|
|
|
@@ -0,0 +0,0 @@ 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
|
|
|
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
|
|
--- a/src/main/java/org/bukkit/map/MapCursor.java
|
|
|
|
+++ b/src/main/java/org/bukkit/map/MapCursor.java
|
|
|
|
@@ -0,0 +0,0 @@ public final class MapCursor {
|
2024-07-18 10:13:20 +02:00
|
|
|
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");
|
|
|
|
|