twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-10 00:52:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

Allow to define new map cursor types (#10782)

Browse Source
This commit is contained in:
Lulu13022002
2024-05-25 23:56:44 +02:00
parent 5af1dfa5cb
commit 8af4ab8bf7
3 changed files with 138 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
patches/api/Allow-to-define-new-map-cursor-types.patch Normal file
View File

@@ -0,0 +1,30 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
Date: Fri, 24 May 2024 20:19:07 +0200
Subject: [PATCH] Allow to define new map cursor types
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 {
*/
@Deprecated(forRemoval = true, since = "1.20.2") // Paper
public void setRawType(byte type) {
- if (type < 0 || type > 26) {
- throw new IllegalArgumentException("Type must be in the range 0-26");
+ if (type < 0 || type > Type.UPPER_MAP_CURSOR_TYPE_BOUND) { // Paper
+ throw new IllegalArgumentException("Type must be in the range 0-" + Type.UPPER_MAP_CURSOR_TYPE_BOUND); // Paper
}
this.type = type;
}
@@ -0,0 +0,0 @@ public final class MapCursor {
TRIAL_CHAMBERS(34, "trial_chambers")
;
+ static final int UPPER_MAP_CURSOR_TYPE_BOUND = Type.values().length - 1; // Paper - cached max value of Type
+
private byte value;
private final NamespacedKey key;

2
patches/api/Fix-Spigot-annotation-mistakes.patch
View File

@@ -311,7 +311,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ * @apiNote Internal Use Only + * @apiNote Internal Use Only
*/ */
- @Deprecated - @Deprecated
+ @org.jetbrains.annotations.ApiStatus.Internal // Paper + @ApiStatus.Internal // Paper
public int getId() { public int getId() {
Preconditions.checkArgument(legacy, "Cannot get ID of Modern Material"); Preconditions.checkArgument(legacy, "Cannot get ID of Modern Material");
return id; return id;

180
patches/api/add-missing-Experimental-annotations.patch
View File

@@ -34,67 +34,67 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
* BlockData: {@link Slab} * BlockData: {@link Slab}
*/ */
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
TUFF_SLAB(19305, Slab.class), TUFF_SLAB(19305, Slab.class),
/** /**
* BlockData: {@link Stairs} * BlockData: {@link Stairs}
*/ */
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
TUFF_STAIRS(11268, Stairs.class), TUFF_STAIRS(11268, Stairs.class),
/** /**
* BlockData: {@link Wall} * BlockData: {@link Wall}
*/ */
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
TUFF_WALL(24395, Wall.class), TUFF_WALL(24395, Wall.class),
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
CHISELED_TUFF(15831), CHISELED_TUFF(15831),
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
POLISHED_TUFF(17801), POLISHED_TUFF(17801),
/** /**
* BlockData: {@link Slab} * BlockData: {@link Slab}
*/ */
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
POLISHED_TUFF_SLAB(31096, Slab.class), POLISHED_TUFF_SLAB(31096, Slab.class),
/** /**
* BlockData: {@link Stairs} * BlockData: {@link Stairs}
*/ */
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
POLISHED_TUFF_STAIRS(7964, Stairs.class), POLISHED_TUFF_STAIRS(7964, Stairs.class),
/** /**
* BlockData: {@link Wall} * BlockData: {@link Wall}
*/ */
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
POLISHED_TUFF_WALL(28886, Wall.class), POLISHED_TUFF_WALL(28886, Wall.class),
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
TUFF_BRICKS(26276), TUFF_BRICKS(26276),
/** /**
* BlockData: {@link Slab} * BlockData: {@link Slab}
*/ */
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
TUFF_BRICK_SLAB(11843, Slab.class), TUFF_BRICK_SLAB(11843, Slab.class),
/** /**
* BlockData: {@link Stairs} * BlockData: {@link Stairs}
*/ */
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
TUFF_BRICK_STAIRS(30753, Stairs.class), TUFF_BRICK_STAIRS(30753, Stairs.class),
/** /**
* BlockData: {@link Wall} * BlockData: {@link Wall}
*/ */
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
TUFF_BRICK_WALL(11761, Wall.class), TUFF_BRICK_WALL(11761, Wall.class),
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
CHISELED_TUFF_BRICKS(8601), CHISELED_TUFF_BRICKS(8601),
DRIPSTONE_BLOCK(26227), DRIPSTONE_BLOCK(26227),
/** /**
@@ -102,7 +102,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
* BlockData: {@link Waterlogged} * BlockData: {@link Waterlogged}
*/ */
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
HEAVY_CORE(15788, Waterlogged.class), HEAVY_CORE(15788, Waterlogged.class),
AMETHYST_BLOCK(18919), AMETHYST_BLOCK(18919),
BUDDING_AMETHYST(13963), BUDDING_AMETHYST(13963),
@@ -110,16 +110,16 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
WEATHERED_COPPER(19699), WEATHERED_COPPER(19699),
OXIDIZED_COPPER(19490), OXIDIZED_COPPER(19490),
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
CHISELED_COPPER(12143), CHISELED_COPPER(12143),
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
EXPOSED_CHISELED_COPPER(4570), EXPOSED_CHISELED_COPPER(4570),
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
WEATHERED_CHISELED_COPPER(30876), WEATHERED_CHISELED_COPPER(30876),
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
OXIDIZED_CHISELED_COPPER(27719), OXIDIZED_CHISELED_COPPER(27719),
CUT_COPPER(32519), CUT_COPPER(32519),
EXPOSED_CUT_COPPER(18000), EXPOSED_CUT_COPPER(18000),
@@ -127,16 +127,16 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
WAXED_WEATHERED_COPPER(5960), WAXED_WEATHERED_COPPER(5960),
WAXED_OXIDIZED_COPPER(25626), WAXED_OXIDIZED_COPPER(25626),
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
WAXED_CHISELED_COPPER(7500), WAXED_CHISELED_COPPER(7500),
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
WAXED_EXPOSED_CHISELED_COPPER(30658), WAXED_EXPOSED_CHISELED_COPPER(30658),
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
WAXED_WEATHERED_CHISELED_COPPER(5970), WAXED_WEATHERED_CHISELED_COPPER(5970),
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
WAXED_OXIDIZED_CHISELED_COPPER(7735), WAXED_OXIDIZED_CHISELED_COPPER(7735),
WAXED_CUT_COPPER(11030), WAXED_CUT_COPPER(11030),
WAXED_EXPOSED_CUT_COPPER(30043), WAXED_EXPOSED_CUT_COPPER(30043),
@@ -144,49 +144,49 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
* BlockData: {@link Door} * BlockData: {@link Door}
*/ */
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
COPPER_DOOR(26809, Door.class), COPPER_DOOR(26809, Door.class),
/** /**
* BlockData: {@link Door} * BlockData: {@link Door}
*/ */
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
EXPOSED_COPPER_DOOR(13236, Door.class), EXPOSED_COPPER_DOOR(13236, Door.class),
/** /**
* BlockData: {@link Door} * BlockData: {@link Door}
*/ */
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
WEATHERED_COPPER_DOOR(10208, Door.class), WEATHERED_COPPER_DOOR(10208, Door.class),
/** /**
* BlockData: {@link Door} * BlockData: {@link Door}
*/ */
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
OXIDIZED_COPPER_DOOR(5348, Door.class), OXIDIZED_COPPER_DOOR(5348, Door.class),
/** /**
* BlockData: {@link Door} * BlockData: {@link Door}
*/ */
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
WAXED_COPPER_DOOR(9954, Door.class), WAXED_COPPER_DOOR(9954, Door.class),
/** /**
* BlockData: {@link Door} * BlockData: {@link Door}
*/ */
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
WAXED_EXPOSED_COPPER_DOOR(20748, Door.class), WAXED_EXPOSED_COPPER_DOOR(20748, Door.class),
/** /**
* BlockData: {@link Door} * BlockData: {@link Door}
*/ */
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
WAXED_WEATHERED_COPPER_DOOR(25073, Door.class), WAXED_WEATHERED_COPPER_DOOR(25073, Door.class),
/** /**
* BlockData: {@link Door} * BlockData: {@link Door}
*/ */
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
WAXED_OXIDIZED_COPPER_DOOR(23888, Door.class), WAXED_OXIDIZED_COPPER_DOOR(23888, Door.class),
/** /**
* BlockData: {@link TrapDoor} * BlockData: {@link TrapDoor}
@@ -194,49 +194,49 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
* BlockData: {@link TrapDoor} * BlockData: {@link TrapDoor}
*/ */
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
COPPER_TRAPDOOR(12110, TrapDoor.class), COPPER_TRAPDOOR(12110, TrapDoor.class),
/** /**
* BlockData: {@link TrapDoor} * BlockData: {@link TrapDoor}
*/ */
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
EXPOSED_COPPER_TRAPDOOR(19219, TrapDoor.class), EXPOSED_COPPER_TRAPDOOR(19219, TrapDoor.class),
/** /**
* BlockData: {@link TrapDoor} * BlockData: {@link TrapDoor}
*/ */
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
WEATHERED_COPPER_TRAPDOOR(28254, TrapDoor.class), WEATHERED_COPPER_TRAPDOOR(28254, TrapDoor.class),
/** /**
* BlockData: {@link TrapDoor} * BlockData: {@link TrapDoor}
*/ */
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
OXIDIZED_COPPER_TRAPDOOR(26518, TrapDoor.class), OXIDIZED_COPPER_TRAPDOOR(26518, TrapDoor.class),
/** /**
* BlockData: {@link TrapDoor} * BlockData: {@link TrapDoor}
*/ */
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
WAXED_COPPER_TRAPDOOR(12626, TrapDoor.class), WAXED_COPPER_TRAPDOOR(12626, TrapDoor.class),
/** /**
* BlockData: {@link TrapDoor} * BlockData: {@link TrapDoor}
*/ */
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
WAXED_EXPOSED_COPPER_TRAPDOOR(11010, TrapDoor.class), WAXED_EXPOSED_COPPER_TRAPDOOR(11010, TrapDoor.class),
/** /**
* BlockData: {@link TrapDoor} * BlockData: {@link TrapDoor}
*/ */
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
WAXED_WEATHERED_COPPER_TRAPDOOR(30709, TrapDoor.class), WAXED_WEATHERED_COPPER_TRAPDOOR(30709, TrapDoor.class),
/** /**
* BlockData: {@link TrapDoor} * BlockData: {@link TrapDoor}
*/ */
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
WAXED_OXIDIZED_COPPER_TRAPDOOR(21450, TrapDoor.class), WAXED_OXIDIZED_COPPER_TRAPDOOR(21450, TrapDoor.class),
/** /**
* BlockData: {@link Gate} * BlockData: {@link Gate}
@@ -245,7 +245,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
COMPASS(24139), COMPASS(24139),
RECOVERY_COMPASS(12710), RECOVERY_COMPASS(12710),
+ @MinecraftExperimental(Requires.BUNDLE) // Paper - add missing annotation + @MinecraftExperimental(Requires.BUNDLE) // Paper - add missing annotation
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
BUNDLE(16835, 1), BUNDLE(16835, 1),
FISHING_ROD(4167, 1, 64), FISHING_ROD(4167, 1, 64),
CLOCK(14980), CLOCK(14980),
@@ -253,7 +253,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
* BlockData: {@link Crafter} * BlockData: {@link Crafter}
*/ */
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
CRAFTER(25243, Crafter.class), CRAFTER(25243, Crafter.class),
FILLED_MAP(23504), FILLED_MAP(23504),
SHEARS(27971, 1, 238), SHEARS(27971, 1, 238),
@@ -261,10 +261,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
BEE_SPAWN_EGG(22924), BEE_SPAWN_EGG(22924),
BLAZE_SPAWN_EGG(4759), BLAZE_SPAWN_EGG(4759),
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
BOGGED_SPAWN_EGG(12042), BOGGED_SPAWN_EGG(12042),
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
BREEZE_SPAWN_EGG(7580), BREEZE_SPAWN_EGG(7580),
CAT_SPAWN_EGG(29583), CAT_SPAWN_EGG(29583),
CAMEL_SPAWN_EGG(14760), CAMEL_SPAWN_EGG(14760),
@@ -272,12 +272,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
EXPERIENCE_BOTTLE(12858), EXPERIENCE_BOTTLE(12858),
FIRE_CHARGE(4842), FIRE_CHARGE(4842),
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
WIND_CHARGE(23928), WIND_CHARGE(23928),
WRITABLE_BOOK(13393, 1), WRITABLE_BOOK(13393, 1),
WRITTEN_BOOK(24164, 16), WRITTEN_BOOK(24164, 16),
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
MACE(4771, 1, 250), MACE(4771, 1, 250),
ITEM_FRAME(27318), ITEM_FRAME(27318),
GLOW_ITEM_FRAME(26473), GLOW_ITEM_FRAME(26473),
@@ -286,10 +286,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
GLOBE_BANNER_PATTERN(27753, 1), GLOBE_BANNER_PATTERN(27753, 1),
PIGLIN_BANNER_PATTERN(22028, 1), PIGLIN_BANNER_PATTERN(22028, 1),
+ @MinecraftExperimental(Requires.UPDATE_1_21) // Paper - add missing annotation + @MinecraftExperimental(Requires.UPDATE_1_21) // Paper - add missing annotation
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
FLOW_BANNER_PATTERN(32683, 1), FLOW_BANNER_PATTERN(32683, 1),
+ @MinecraftExperimental(Requires.UPDATE_1_21) // Paper - add missing annotation + @MinecraftExperimental(Requires.UPDATE_1_21) // Paper - add missing annotation
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
GUSTER_BANNER_PATTERN(27267, 1), GUSTER_BANNER_PATTERN(27267, 1),
GOAT_HORN(28237, 1), GOAT_HORN(28237, 1),
/** /**
@@ -297,10 +297,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
RAISER_ARMOR_TRIM_SMITHING_TEMPLATE(29116), RAISER_ARMOR_TRIM_SMITHING_TEMPLATE(29116),
HOST_ARMOR_TRIM_SMITHING_TEMPLATE(12165), HOST_ARMOR_TRIM_SMITHING_TEMPLATE(12165),
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
FLOW_ARMOR_TRIM_SMITHING_TEMPLATE(29175), FLOW_ARMOR_TRIM_SMITHING_TEMPLATE(29175),
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
BOLT_ARMOR_TRIM_SMITHING_TEMPLATE(9698), BOLT_ARMOR_TRIM_SMITHING_TEMPLATE(9698),
ANGLER_POTTERY_SHERD(9952), ANGLER_POTTERY_SHERD(9952),
ARCHER_POTTERY_SHERD(21629), ARCHER_POTTERY_SHERD(21629),
@@ -308,11 +308,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
DANGER_POTTERY_SHERD(30506), DANGER_POTTERY_SHERD(30506),
EXPLORER_POTTERY_SHERD(5124), EXPLORER_POTTERY_SHERD(5124),
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
FLOW_POTTERY_SHERD(4896), FLOW_POTTERY_SHERD(4896),
FRIEND_POTTERY_SHERD(18221), FRIEND_POTTERY_SHERD(18221),
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
GUSTER_POTTERY_SHERD(28193), GUSTER_POTTERY_SHERD(28193),
HEART_POTTERY_SHERD(17607), HEART_POTTERY_SHERD(17607),
HEARTBREAK_POTTERY_SHERD(21108), HEARTBREAK_POTTERY_SHERD(21108),
@@ -320,7 +320,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
PLENTY_POTTERY_SHERD(28236), PLENTY_POTTERY_SHERD(28236),
PRIZE_POTTERY_SHERD(4341), PRIZE_POTTERY_SHERD(4341),
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
SCRAPE_POTTERY_SHERD(30034), SCRAPE_POTTERY_SHERD(30034),
SHEAF_POTTERY_SHERD(23652), SHEAF_POTTERY_SHERD(23652),
SHELTER_POTTERY_SHERD(28390), SHELTER_POTTERY_SHERD(28390),
@@ -328,121 +328,121 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
* BlockData: {@link Waterlogged} * BlockData: {@link Waterlogged}
*/ */
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
COPPER_GRATE(16221, Waterlogged.class), COPPER_GRATE(16221, Waterlogged.class),
/** /**
* BlockData: {@link Waterlogged} * BlockData: {@link Waterlogged}
*/ */
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
EXPOSED_COPPER_GRATE(7783, Waterlogged.class), EXPOSED_COPPER_GRATE(7783, Waterlogged.class),
/** /**
* BlockData: {@link Waterlogged} * BlockData: {@link Waterlogged}
*/ */
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
WEATHERED_COPPER_GRATE(24954, Waterlogged.class), WEATHERED_COPPER_GRATE(24954, Waterlogged.class),
/** /**
* BlockData: {@link Waterlogged} * BlockData: {@link Waterlogged}
*/ */
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
OXIDIZED_COPPER_GRATE(14122, Waterlogged.class), OXIDIZED_COPPER_GRATE(14122, Waterlogged.class),
/** /**
* BlockData: {@link Waterlogged} * BlockData: {@link Waterlogged}
*/ */
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
WAXED_COPPER_GRATE(11230, Waterlogged.class), WAXED_COPPER_GRATE(11230, Waterlogged.class),
/** /**
* BlockData: {@link Waterlogged} * BlockData: {@link Waterlogged}
*/ */
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
WAXED_EXPOSED_COPPER_GRATE(20520, Waterlogged.class), WAXED_EXPOSED_COPPER_GRATE(20520, Waterlogged.class),
/** /**
* BlockData: {@link Waterlogged} * BlockData: {@link Waterlogged}
*/ */
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
WAXED_WEATHERED_COPPER_GRATE(16533, Waterlogged.class), WAXED_WEATHERED_COPPER_GRATE(16533, Waterlogged.class),
/** /**
* BlockData: {@link Waterlogged} * BlockData: {@link Waterlogged}
*/ */
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
WAXED_OXIDIZED_COPPER_GRATE(32010, Waterlogged.class), WAXED_OXIDIZED_COPPER_GRATE(32010, Waterlogged.class),
/** /**
* BlockData: {@link CopperBulb} * BlockData: {@link CopperBulb}
*/ */
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
COPPER_BULB(21370, CopperBulb.class), COPPER_BULB(21370, CopperBulb.class),
/** /**
* BlockData: {@link CopperBulb} * BlockData: {@link CopperBulb}
*/ */
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
EXPOSED_COPPER_BULB(11944, CopperBulb.class), EXPOSED_COPPER_BULB(11944, CopperBulb.class),
/** /**
* BlockData: {@link CopperBulb} * BlockData: {@link CopperBulb}
*/ */
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
WEATHERED_COPPER_BULB(10800, CopperBulb.class), WEATHERED_COPPER_BULB(10800, CopperBulb.class),
/** /**
* BlockData: {@link CopperBulb} * BlockData: {@link CopperBulb}
*/ */
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
OXIDIZED_COPPER_BULB(22421, CopperBulb.class), OXIDIZED_COPPER_BULB(22421, CopperBulb.class),
/** /**
* BlockData: {@link CopperBulb} * BlockData: {@link CopperBulb}
*/ */
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
WAXED_COPPER_BULB(23756, CopperBulb.class), WAXED_COPPER_BULB(23756, CopperBulb.class),
/** /**
* BlockData: {@link CopperBulb} * BlockData: {@link CopperBulb}
*/ */
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
WAXED_EXPOSED_COPPER_BULB(5530, CopperBulb.class), WAXED_EXPOSED_COPPER_BULB(5530, CopperBulb.class),
/** /**
* BlockData: {@link CopperBulb} * BlockData: {@link CopperBulb}
*/ */
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
WAXED_WEATHERED_COPPER_BULB(13239, CopperBulb.class), WAXED_WEATHERED_COPPER_BULB(13239, CopperBulb.class),
/** /**
* BlockData: {@link CopperBulb} * BlockData: {@link CopperBulb}
*/ */
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
WAXED_OXIDIZED_COPPER_BULB(26892, CopperBulb.class), WAXED_OXIDIZED_COPPER_BULB(26892, CopperBulb.class),
/** /**
* BlockData: {@link TrialSpawner} * BlockData: {@link TrialSpawner}
*/ */
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
TRIAL_SPAWNER(19902, TrialSpawner.class), TRIAL_SPAWNER(19902, TrialSpawner.class),
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
TRIAL_KEY(12725), TRIAL_KEY(12725),
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
OMINOUS_TRIAL_KEY(4986), OMINOUS_TRIAL_KEY(4986),
/** /**
* BlockData: {@link Vault} * BlockData: {@link Vault}
*/ */
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
VAULT(6288, Vault.class), VAULT(6288, Vault.class),
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
OMINOUS_BOTTLE(26321), OMINOUS_BOTTLE(26321),
@MinecraftExperimental(Requires.UPDATE_1_21) @MinecraftExperimental(Requires.UPDATE_1_21)
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + @ApiStatus.Experimental // Paper - add missing annotation
BREEZE_ROD(14281), BREEZE_ROD(14281),
/** /**
* BlockData: {@link Levelled} * BlockData: {@link Levelled}
@@ -1081,6 +1081,40 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
TRIAL_CHAMBER_ITEMS_TO_DROP_WHEN_OMINOUS("spawners/trial_chamber/items_to_drop_when_ominous"), TRIAL_CHAMBER_ITEMS_TO_DROP_WHEN_OMINOUS("spawners/trial_chamber/items_to_drop_when_ominous"),
// Shearing // Shearing
SHEARING_BOGGED("shearing/bogged"), SHEARING_BOGGED("shearing/bogged"),
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 {
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
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
SWAMP_HUT(33, "swamp_hut"),
+ @org.bukkit.MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.UPDATE_1_21) // Paper - add missing annotation
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
TRIAL_CHAMBERS(34, "trial_chambers")
;
diff --git a/src/main/java/org/bukkit/potion/PotionEffectType.java b/src/main/java/org/bukkit/potion/PotionEffectType.java diff --git a/src/main/java/org/bukkit/potion/PotionEffectType.java b/src/main/java/org/bukkit/potion/PotionEffectType.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/potion/PotionEffectType.java --- a/src/main/java/org/bukkit/potion/PotionEffectType.java