mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-22 10:35:38 +01:00
38b3182a90
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: befcf86d SPIGOT-7740: Fix using new map cursor types 09229095 Add EntityDamageEvent.DamageCause#CAMPFIRE CraftBukkit Changes: a1d2cd152 SPIGOT-7747: Mob head is not dropped when mob was blown up by a charged creeper 8078294bc SPIGOT-7746: Server Crashing when Players Getting into End Portals 8d842e250 SPIGOT-7744: Fix exception for shooting projectiles with flame enchantment 64e0ad129 SPIGOT-7744: Fix crash when shooting arrows in creative mode 819f7a10a Fix player items not dropping on death 0a0229bb5 Implement DamageCause#CAMPFIRE and minor improvement in exception for Unhandled block damage
113 lines
7.0 KiB
Diff
113 lines
7.0 KiB
Diff
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
|
|
Subject: [PATCH] add missing Experimental annotations
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/FeatureFlag.java b/src/main/java/org/bukkit/FeatureFlag.java
|
|
index 7522c611b5214dd09867c434d5f7cf161f5c04ca..026b1832bcd163ab89668c991bf002e608e36aef 100644
|
|
--- a/src/main/java/org/bukkit/FeatureFlag.java
|
|
+++ b/src/main/java/org/bukkit/FeatureFlag.java
|
|
@@ -13,6 +13,7 @@ public interface FeatureFlag extends Keyed {
|
|
|
|
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"));
|
|
|
|
/**
|
|
@@ -23,6 +24,7 @@ public interface FeatureFlag extends Keyed {
|
|
@Deprecated
|
|
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"));
|
|
|
|
/**
|
|
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
|
|
index c4f067598a40b0381bc9e601a3809e2683c10407..54704da43cf9c429f3914f0580246dde99aa93c0 100644
|
|
--- a/src/main/java/org/bukkit/Material.java
|
|
+++ b/src/main/java/org/bukkit/Material.java
|
|
@@ -2497,6 +2497,8 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
|
|
EGG(21603, 16),
|
|
COMPASS(24139),
|
|
RECOVERY_COMPASS(12710),
|
|
+ @MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.BUNDLE) // Paper - add missing annotation
|
|
+ @ApiStatus.Experimental // Paper - add missing annotation
|
|
BUNDLE(16835, 1),
|
|
FISHING_ROD(4167, 1, 64),
|
|
CLOCK(14980),
|
|
diff --git a/src/main/java/org/bukkit/Sound.java b/src/main/java/org/bukkit/Sound.java
|
|
index b2ff1da3386223a544ab5fc363a90c66c8869242..8c7b50906fc5b84c5570408f357410810bbfbded 100644
|
|
--- a/src/main/java/org/bukkit/Sound.java
|
|
+++ b/src/main/java/org/bukkit/Sound.java
|
|
@@ -1506,8 +1506,14 @@ 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"),
|
|
+ @MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.BUNDLE) // Paper - add missing annotation
|
|
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
|
ITEM_BUNDLE_DROP_CONTENTS("item.bundle.drop_contents"),
|
|
+ @MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.BUNDLE) // Paper - add missing annotation
|
|
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
|
ITEM_BUNDLE_INSERT("item.bundle.insert"),
|
|
+ @MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.BUNDLE) // Paper - add missing annotation
|
|
+ @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"),
|
|
diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java
|
|
index 8bfec649f7c6dda956bc388a21b489f3565ff384..a303bb1a8d8b5749de5d69d079383e6da2e446d1 100644
|
|
--- a/src/main/java/org/bukkit/Tag.java
|
|
+++ b/src/main/java/org/bukkit/Tag.java
|
|
@@ -1253,6 +1253,7 @@ public interface Tag<T extends Keyed> extends Keyed {
|
|
/**
|
|
* Vanilla tag representing entities which can turn in boats.
|
|
*/
|
|
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
|
|
Tag<EntityType> ENTITY_TYPES_CAN_TURN_IN_BOATS = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("can_turn_in_boats"), EntityType.class);
|
|
/**
|
|
* Vanilla tag representing all entities sensitive to illager enchantments.
|
|
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 {
|
|
|
|
diff --git a/src/main/java/org/bukkit/map/MapCursor.java b/src/main/java/org/bukkit/map/MapCursor.java
|
|
index a17b755da4eca0370680a9777ff3c7de422f5079..aa3b84ef523cd493b89159ed9d81fc19c2285709 100644
|
|
--- a/src/main/java/org/bukkit/map/MapCursor.java
|
|
+++ b/src/main/java/org/bukkit/map/MapCursor.java
|
|
@@ -311,12 +311,25 @@ 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
|
|
SWAMP_HUT(33, "swamp_hut"),
|
|
TRIAL_CHAMBERS(34, "trial_chambers")
|
|
;
|