SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests Aktivität

mark experimental api correctly and add missing isFuel

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Jake Potrebic 2023-03-14 11:08:29 -07:00
Ursprung 15ade6f446
Commit f29f49ac23
2 geänderte Dateien mit 403 neuen und 0 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

23
patches/api/Add-missing-isFuel-Material-entries.patch
Datei anzeigen

@ -52,6 +52,29 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
case BIRCH_LOG:
case BIRCH_PLANKS:
case BIRCH_PRESSURE_PLATE:
@@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
case BROWN_WOOL:
case CARTOGRAPHY_TABLE:
case CHARCOAL:
+ // Paper start - add missing isFuels
+ case CHERRY_BOAT:
+ case CHERRY_BUTTON:
+ case CHERRY_CHEST_BOAT:
+ case CHERRY_DOOR:
+ case CHERRY_FENCE:
+ case CHERRY_FENCE_GATE:
+ case CHERRY_HANGING_SIGN:
+ case CHERRY_PLANKS:
+ case CHERRY_PRESSURE_PLATE:
+ case CHERRY_SAPLING:
+ case CHERRY_SIGN:
+ case CHERRY_SLAB:
+ case CHERRY_STAIRS:
+ case CHERRY_TRAPDOOR:
+ // Paper end
case CHEST:
case CHISELED_BOOKSHELF:
case COAL:
@@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
case DARK_OAK_DOOR:
case DARK_OAK_FENCE:

380
patches/api/Mark-experimental-api-as-such.patch
Datei anzeigen

@ -9,6 +9,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
--- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java
@@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
BIRCH_PLANKS(29322),
JUNGLE_PLANKS(26445),
ACACIA_PLANKS(31312),
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
CHERRY_PLANKS(8354),
DARK_OAK_PLANKS(20869),
MANGROVE_PLANKS(7078),
@ -20,6 +24,30 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
BAMBOO_MOSAIC(10715),
/**
* BlockData: {@link Sapling}
@@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
/**
* BlockData: {@link Sapling}
*/
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
CHERRY_SAPLING(25204, Sapling.class),
/**
* BlockData: {@link Sapling}
@@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
/**
* BlockData: {@link SuspiciousSand}
*/
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
SUSPICIOUS_SAND(18410, SuspiciousSand.class),
RED_SAND(16279),
GRAVEL(7804),
@@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
/**
* BlockData: {@link Orientable}
*/
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
CHERRY_LOG(20847, Orientable.class),
/**
* BlockData: {@link Orientable}
@@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
/**
* BlockData: {@link Orientable}
@ -32,10 +60,66 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
/**
* BlockData: {@link Orientable}
*/
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
STRIPPED_CHERRY_LOG(18061, Orientable.class),
/**
* BlockData: {@link Orientable}
@@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
/**
* BlockData: {@link Orientable}
*/
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
STRIPPED_CHERRY_WOOD(19647, Orientable.class),
/**
* BlockData: {@link Orientable}
@@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
/**
* BlockData: {@link Orientable}
*/
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
STRIPPED_BAMBOO_BLOCK(14799, Orientable.class),
/**
* BlockData: {@link Orientable}
@@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
/**
* BlockData: {@link Orientable}
*/
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
CHERRY_WOOD(9826, Orientable.class),
/**
* BlockData: {@link Orientable}
@@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
/**
* BlockData: {@link Leaves}
*/
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
CHERRY_LEAVES(20856, Leaves.class),
/**
* BlockData: {@link Leaves}
@@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
CORNFLOWER(15405),
LILY_OF_THE_VALLEY(7185),
WITHER_ROSE(8619),
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
TORCHFLOWER(4501),
SPORE_BLOSSOM(20627),
BROWN_MUSHROOM(9665),
@@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
/**
* BlockData: {@link PinkPetals}
*/
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
PINK_PETALS(10420, PinkPetals.class),
MOSS_BLOCK(9175),
/**
@@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
/**
* BlockData: {@link Slab}
*/
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
CHERRY_SLAB(16673, Slab.class),
/**
* BlockData: {@link Slab}
@@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
/**
* BlockData: {@link Slab}
@ -57,6 +141,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
CHISELED_BOOKSHELF(8099, ChiseledBookshelf.class),
/**
* BlockData: {@link DecoratedPot}
*/
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
DECORATED_POT(8720, 1, DecoratedPot.class),
MOSSY_COBBLESTONE(21900),
OBSIDIAN(32723),
@@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
/**
* BlockData: {@link Fence}
*/
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
CHERRY_FENCE(32047, Fence.class),
/**
* BlockData: {@link Fence}
@@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
/**
* BlockData: {@link Fence}
@ -69,6 +166,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
/**
* BlockData: {@link Stairs}
*/
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
CHERRY_STAIRS(18380, Stairs.class),
/**
* BlockData: {@link Stairs}
@@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
/**
* BlockData: {@link Stairs}
*/
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
BAMBOO_STAIRS(25674, Stairs.class),
/**
@ -82,6 +187,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
/**
* BlockData: {@link Switch}
*/
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
CHERRY_BUTTON(9058, Switch.class),
/**
* BlockData: {@link Switch}
@@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
/**
* BlockData: {@link Switch}
*/
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
BAMBOO_BUTTON(21810, Switch.class),
/**
@ -90,6 +203,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
/**
* BlockData: {@link Powerable}
*/
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
CHERRY_PRESSURE_PLATE(8651, Powerable.class),
/**
* BlockData: {@link Powerable}
@@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
/**
* BlockData: {@link Powerable}
*/
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
BAMBOO_PRESSURE_PLATE(26740, Powerable.class),
/**
@ -98,6 +219,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
/**
* BlockData: {@link Door}
*/
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
CHERRY_DOOR(12684, Door.class),
/**
* BlockData: {@link Door}
@@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
/**
* BlockData: {@link Door}
*/
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
BAMBOO_DOOR(19971, Door.class),
/**
@ -106,6 +235,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
/**
* BlockData: {@link TrapDoor}
*/
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
CHERRY_TRAPDOOR(6293, TrapDoor.class),
/**
* BlockData: {@link TrapDoor}
@@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
/**
* BlockData: {@link TrapDoor}
*/
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
BAMBOO_TRAPDOOR(9174, TrapDoor.class),
/**
@ -114,11 +251,27 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
/**
* BlockData: {@link Gate}
*/
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
CHERRY_FENCE_GATE(28222, Gate.class),
/**
* BlockData: {@link Gate}
@@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
/**
* BlockData: {@link Gate}
*/
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
BAMBOO_FENCE_GATE(14290, Gate.class),
/**
* BlockData: {@link Gate}
@@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
JUNGLE_CHEST_BOAT(20133, 1),
ACACIA_BOAT(27326, 1),
ACACIA_CHEST_BOAT(28455, 1),
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
CHERRY_BOAT(13628, 1),
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
CHERRY_CHEST_BOAT(7165, 1),
DARK_OAK_BOAT(28618, 1),
DARK_OAK_CHEST_BOAT(8733, 1),
MANGROVE_BOAT(20792, 1),
MANGROVE_CHEST_BOAT(18572, 1),
@ -132,6 +285,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
/**
* BlockData: {@link Sign}
*/
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
CHERRY_SIGN(16520, 16, Sign.class),
/**
* BlockData: {@link Sign}
@@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
/**
* BlockData: {@link Sign}
*/
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
BAMBOO_SIGN(26139, 16, Sign.class),
/**
@ -210,6 +371,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
CAMEL_SPAWN_EGG(14760),
CAVE_SPIDER_SPAWN_EGG(23341),
CHICKEN_SPAWN_EGG(5462),
@@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
SKELETON_SPAWN_EGG(15261),
SKELETON_HORSE_SPAWN_EGG(21356),
SLIME_SPAWN_EGG(17196),
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
SNIFFER_SPAWN_EGG(27473),
SNOW_GOLEM_SPAWN_EGG(24732),
SPIDER_SPAWN_EGG(14984),
@@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
/**
* BlockData: {@link Rotatable}
@ -218,6 +387,70 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
PIGLIN_HEAD(5512, Rotatable.class),
NETHER_STAR(12469),
PUMPKIN_PIE(28725),
@@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
END_CRYSTAL(19090),
CHORUS_FRUIT(7652),
POPPED_CHORUS_FRUIT(27844),
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
TORCHFLOWER_SEEDS(18153),
BEETROOT(23305),
BEETROOT_SEEDS(21282),
@@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
NAUTILUS_SHELL(19989),
HEART_OF_THE_SEA(11807),
CROSSBOW(4340, 1, 465),
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
SUSPICIOUS_STEW(8173, 1),
/**
* BlockData: {@link Directional}
@@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
PEARLESCENT_FROGLIGHT(21441, Orientable.class),
FROGSPAWN(8350),
ECHO_SHARD(12529),
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
BRUSH(30569, 1, 64),
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
NETHERITE_UPGRADE_SMITHING_TEMPLATE(7615),
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
SENTRY_ARMOR_TRIM_SMITHING_TEMPLATE(16124),
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
DUNE_ARMOR_TRIM_SMITHING_TEMPLATE(30925),
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
COAST_ARMOR_TRIM_SMITHING_TEMPLATE(25501),
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
WILD_ARMOR_TRIM_SMITHING_TEMPLATE(5870),
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
WARD_ARMOR_TRIM_SMITHING_TEMPLATE(24534),
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
EYE_ARMOR_TRIM_SMITHING_TEMPLATE(14663),
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
VEX_ARMOR_TRIM_SMITHING_TEMPLATE(25818),
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
TIDE_ARMOR_TRIM_SMITHING_TEMPLATE(20420),
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
SNOUT_ARMOR_TRIM_SMITHING_TEMPLATE(14386),
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
RIB_ARMOR_TRIM_SMITHING_TEMPLATE(6010),
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
SPIRE_ARMOR_TRIM_SMITHING_TEMPLATE(29143),
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
POTTERY_SHARD_ARCHER(26154),
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
POTTERY_SHARD_PRIZE(31677),
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
POTTERY_SHARD_ARMS_UP(29222),
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
POTTERY_SHARD_SKULL(14619),
/**
* BlockData: {@link Levelled}
@@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
/**
* BlockData: {@link WallSign}
*/
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
CHERRY_WALL_SIGN(20188, 16, WallSign.class),
/**
* BlockData: {@link WallSign}
@@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
/**
* BlockData: {@link WallSign}
@ -281,6 +514,21 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
BAMBOO_WALL_HANGING_SIGN(6669, WallHangingSign.class),
/**
* BlockData: {@link RedstoneWallTorch}
@@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
* BlockData: {@link Tripwire}
*/
TRIPWIRE(8810, Tripwire.class),
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
POTTED_TORCHFLOWER(21278),
POTTED_OAK_SAPLING(11905),
POTTED_SPRUCE_SAPLING(29498),
POTTED_BIRCH_SAPLING(32484),
POTTED_JUNGLE_SAPLING(7525),
POTTED_ACACIA_SAPLING(14096),
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
POTTED_CHERRY_SAPLING(30785),
POTTED_DARK_OAK_SAPLING(6486),
POTTED_MANGROVE_PROPAGULE(22003),
@@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
/**
* BlockData: {@link Directional}
@ -289,6 +537,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
PIGLIN_WALL_HEAD(4446, Directional.class),
/**
* BlockData: {@link Directional}
@@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
/**
* BlockData: {@link Ageable}
*/
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
TORCHFLOWER_CROP(28460, Ageable.class),
/**
* BlockData: {@link Ageable}
diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/Tag.java
@ -346,6 +602,18 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+@org.jetbrains.annotations.ApiStatus.Experimental // Paper
public interface ChiseledBookshelf extends TileState, BlockInventoryHolder {
/**
diff --git a/src/main/java/org/bukkit/block/DecoratedPot.java b/src/main/java/org/bukkit/block/DecoratedPot.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/block/DecoratedPot.java
+++ b/src/main/java/org/bukkit/block/DecoratedPot.java
@@ -0,0 +0,0 @@ import org.jetbrains.annotations.Nullable;
/**
* Represents a captured state of a decorated pot.
*/
+@org.jetbrains.annotations.ApiStatus.Experimental // Paper
public interface DecoratedPot extends TileState {
/**
diff --git a/src/main/java/org/bukkit/block/HangingSign.java b/src/main/java/org/bukkit/block/HangingSign.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
@ -377,6 +645,18 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
public void setNoteBlockSound(@Nullable NamespacedKey noteBlockSound);
/**
diff --git a/src/main/java/org/bukkit/block/SuspiciousSand.java b/src/main/java/org/bukkit/block/SuspiciousSand.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/block/SuspiciousSand.java
+++ b/src/main/java/org/bukkit/block/SuspiciousSand.java
@@ -0,0 +0,0 @@ import org.jetbrains.annotations.Nullable;
/**
* Represents a captured state of suspicious sand.
*/
+@org.jetbrains.annotations.ApiStatus.Experimental // Paper
public interface SuspiciousSand extends Lootable, TileState {
/**
diff --git a/src/main/java/org/bukkit/block/data/type/ChiseledBookshelf.java b/src/main/java/org/bukkit/block/data/type/ChiseledBookshelf.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
@ -390,6 +670,17 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
public interface ChiseledBookshelf extends Directional {
/**
diff --git a/src/main/java/org/bukkit/block/data/type/DecoratedPot.java b/src/main/java/org/bukkit/block/data/type/DecoratedPot.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/block/data/type/DecoratedPot.java
+++ b/src/main/java/org/bukkit/block/data/type/DecoratedPot.java
@@ -0,0 +0,0 @@ package org.bukkit.block.data.type;
import org.bukkit.block.data.Directional;
import org.bukkit.block.data.Waterlogged;
+@org.jetbrains.annotations.ApiStatus.Experimental // Paper
public interface DecoratedPot extends Directional, Waterlogged {
}
diff --git a/src/main/java/org/bukkit/block/data/type/HangingSign.java b/src/main/java/org/bukkit/block/data/type/HangingSign.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/block/data/type/HangingSign.java
@ -401,6 +692,30 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+@org.jetbrains.annotations.ApiStatus.Experimental // Paper
public interface HangingSign extends Attachable, Rotatable, Waterlogged {
}
diff --git a/src/main/java/org/bukkit/block/data/type/PinkPetals.java b/src/main/java/org/bukkit/block/data/type/PinkPetals.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/block/data/type/PinkPetals.java
+++ b/src/main/java/org/bukkit/block/data/type/PinkPetals.java
@@ -0,0 +0,0 @@ import org.bukkit.block.data.Directional;
/**
* 'flower_amount' represents the number of petals.
*/
+@org.jetbrains.annotations.ApiStatus.Experimental // Paper
public interface PinkPetals extends Directional {
/**
diff --git a/src/main/java/org/bukkit/block/data/type/SuspiciousSand.java b/src/main/java/org/bukkit/block/data/type/SuspiciousSand.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/block/data/type/SuspiciousSand.java
+++ b/src/main/java/org/bukkit/block/data/type/SuspiciousSand.java
@@ -0,0 +0,0 @@ import org.bukkit.block.data.BlockData;
/**
* 'dusted' represents how far uncovered by brush the block is.
*/
+@org.jetbrains.annotations.ApiStatus.Experimental // Paper
public interface SuspiciousSand extends BlockData {
/**
diff --git a/src/main/java/org/bukkit/block/data/type/WallHangingSign.java b/src/main/java/org/bukkit/block/data/type/WallHangingSign.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/block/data/type/WallHangingSign.java
@ -417,6 +732,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
--- a/src/main/java/org/bukkit/entity/Boat.java
+++ b/src/main/java/org/bukkit/entity/Boat.java
@@ -0,0 +0,0 @@ public interface Boat extends Vehicle {
BIRCH(Material.BIRCH_PLANKS),
JUNGLE(Material.JUNGLE_PLANKS),
ACACIA(Material.ACACIA_PLANKS),
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
CHERRY(Material.CHERRY_PLANKS),
DARK_OAK(Material.DARK_OAK_PLANKS),
MANGROVE(Material.MANGROVE_PLANKS),
@ -448,6 +767,35 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
CAMEL("camel", Camel.class, -1),
BLOCK_DISPLAY("block_display", BlockDisplay.class, -1),
INTERACTION("interaction", Interaction.class, -1),
ITEM_DISPLAY("item_display", ItemDisplay.class, -1),
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
SNIFFER("sniffer", Sniffer.class, -1),
TEXT_DISPLAY("text_display", TextDisplay.class, -1),
/**
diff --git a/src/main/java/org/bukkit/entity/Sniffer.java b/src/main/java/org/bukkit/entity/Sniffer.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/entity/Sniffer.java
+++ b/src/main/java/org/bukkit/entity/Sniffer.java
@@ -0,0 +0,0 @@ package org.bukkit.entity;
/**
* Represents a Sniffer.
*/
+@org.jetbrains.annotations.ApiStatus.Experimental // Paper
public interface Sniffer extends Animals {
}
diff --git a/src/main/java/org/bukkit/entity/memory/MemoryKey.java b/src/main/java/org/bukkit/entity/memory/MemoryKey.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/entity/memory/MemoryKey.java
+++ b/src/main/java/org/bukkit/entity/memory/MemoryKey.java
@@ -0,0 +0,0 @@ public final class MemoryKey<T> implements Keyed {
public static final MemoryKey<Location> LIKED_NOTEBLOCK_POSITION = new MemoryKey<>(NamespacedKey.minecraft("liked_noteblock"), Location.class);
public static final MemoryKey<Integer> LIKED_NOTEBLOCK_COOLDOWN_TICKS = new MemoryKey<>(NamespacedKey.minecraft("liked_noteblock_cooldown_ticks"), Integer.class);
public static final MemoryKey<Integer> ITEM_PICKUP_COOLDOWN_TICKS = new MemoryKey<>(NamespacedKey.minecraft("item_pickup_cooldown_ticks"), Integer.class);
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
public static final MemoryKey<Location> SNIFFER_EXPLORED_POSITIONS = new MemoryKey<>(NamespacedKey.minecraft("sniffer_explored_positions"), Location.class);
/**
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
@ -460,6 +808,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
CHISELED_BOOKSHELF(6, "Chiseled Bookshelf"),
/**
* The new smithing inventory, with 3 CRAFTING slots and 1 RESULT slot.
*
* @deprecated draft, experimental 1.20 API
*/
- @Deprecated
+ @Deprecated @org.jetbrains.annotations.ApiStatus.Experimental // Paper
SMITHING_NEW(4, "Upgrade Gear"),
;
diff --git a/src/main/java/org/bukkit/inventory/ChiseledBookshelfInventory.java b/src/main/java/org/bukkit/inventory/ChiseledBookshelfInventory.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/inventory/ChiseledBookshelfInventory.java
@ -472,6 +828,30 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
public interface ChiseledBookshelfInventory extends Inventory {
@Nullable
diff --git a/src/main/java/org/bukkit/inventory/SmithingTransformRecipe.java b/src/main/java/org/bukkit/inventory/SmithingTransformRecipe.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/inventory/SmithingTransformRecipe.java
+++ b/src/main/java/org/bukkit/inventory/SmithingTransformRecipe.java
@@ -0,0 +0,0 @@ import org.jetbrains.annotations.NotNull;
/**
* Represents a smithing transform recipe.
*/
+@org.jetbrains.annotations.ApiStatus.Experimental // Paper
public class SmithingTransformRecipe extends SmithingRecipe {
private final RecipeChoice template;
diff --git a/src/main/java/org/bukkit/inventory/SmithingTrimRecipe.java b/src/main/java/org/bukkit/inventory/SmithingTrimRecipe.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/inventory/SmithingTrimRecipe.java
+++ b/src/main/java/org/bukkit/inventory/SmithingTrimRecipe.java
@@ -0,0 +0,0 @@ import org.jetbrains.annotations.NotNull;
/**
* Represents a smithing trim recipe.
*/
+@org.jetbrains.annotations.ApiStatus.Experimental // Paper
public class SmithingTrimRecipe extends SmithingRecipe implements ComplexRecipe {
private final RecipeChoice template;
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