Update to Minecraft 1.21

By: md_5 <git@md-5.net>
This commit is contained in:
Bukkit/Spigot
2024-06-14 01:05:00 +10:00
parent 9c6bdb14e4
commit 5c69fd52f0
62 changed files with 550 additions and 610 deletions

View File

@@ -17,14 +17,20 @@ public interface AbstractArrow extends Projectile {
* of the bow that shot it.
*
* @return the knockback strength value
* @see #getWeapon()
* @deprecated a function of the firing weapon
*/
@Deprecated
public int getKnockbackStrength();
/**
* Sets the knockback strength for an arrow.
*
* @param knockbackStrength the knockback strength value
* @see #setWeapon(org.bukkit.inventory.ItemStack)
* @deprecated a function of the firing weapon
*/
@Deprecated
public void setKnockbackStrength(int knockbackStrength);
/**
@@ -123,7 +129,10 @@ public interface AbstractArrow extends Projectile {
* Sets if this arrow was shot from a crossbow.
*
* @param shotFromCrossbow if shot from a crossbow
* @see #setWeapon(org.bukkit.inventory.ItemStack)
* @deprecated a function of the firing weapon instead
*/
@Deprecated
public void setShotFromCrossbow(boolean shotFromCrossbow);
/**
@@ -143,6 +152,23 @@ public interface AbstractArrow extends Projectile {
@ApiStatus.Experimental
public void setItem(@NotNull ItemStack item);
/**
* Gets the ItemStack which fired this arrow.
*
* @return The firing ItemStack
*/
@NotNull
@ApiStatus.Experimental
public ItemStack getWeapon();
/**
* Sets the ItemStack which fired this arrow.
*
* @param item The firing ItemStack
*/
@ApiStatus.Experimental
public void setWeapon(@NotNull ItemStack item);
/**
* Represents the pickup status of this arrow.
*/

View File

@@ -1,13 +1,10 @@
package org.bukkit.entity;
import org.bukkit.MinecraftExperimental;
import org.bukkit.MinecraftExperimental.Requires;
import org.jetbrains.annotations.ApiStatus;
/**
* Represents a Wind Charge.
*/
@MinecraftExperimental(Requires.UPDATE_1_21)
@ApiStatus.Experimental
public interface AbstractWindCharge extends Fireball {

View File

@@ -1,13 +1,10 @@
package org.bukkit.entity;
import org.bukkit.MinecraftExperimental;
import org.bukkit.MinecraftExperimental.Requires;
import org.jetbrains.annotations.ApiStatus;
/**
* Represents a Bogged Skeleton.
*/
@MinecraftExperimental(Requires.UPDATE_1_21)
@ApiStatus.Experimental
public interface Bogged extends AbstractSkeleton {
}

View File

@@ -1,13 +1,10 @@
package org.bukkit.entity;
import org.bukkit.MinecraftExperimental;
import org.bukkit.MinecraftExperimental.Requires;
import org.jetbrains.annotations.ApiStatus;
/**
* Represents a Breeze. Whoosh!
*/
@MinecraftExperimental(Requires.UPDATE_1_21)
@ApiStatus.Experimental
public interface Breeze extends Monster {
}

View File

@@ -1,13 +1,10 @@
package org.bukkit.entity;
import org.bukkit.MinecraftExperimental;
import org.bukkit.MinecraftExperimental.Requires;
import org.jetbrains.annotations.ApiStatus;
/**
* Represents a Wind Charge.
*/
@MinecraftExperimental(Requires.UPDATE_1_21)
@ApiStatus.Experimental
public interface BreezeWindCharge extends AbstractWindCharge {

View File

@@ -7,8 +7,6 @@ import java.util.Map;
import org.bukkit.Bukkit;
import org.bukkit.Keyed;
import org.bukkit.Location;
import org.bukkit.MinecraftExperimental;
import org.bukkit.MinecraftExperimental.Requires;
import org.bukkit.NamespacedKey;
import org.bukkit.Translatable;
import org.bukkit.World;
@@ -21,7 +19,6 @@ import org.bukkit.entity.minecart.SpawnerMinecart;
import org.bukkit.entity.minecart.StorageMinecart;
import org.bukkit.inventory.ItemStack;
import org.bukkit.potion.PotionEffectType;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -288,21 +285,11 @@ public enum EntityType implements Keyed, Translatable {
ITEM_DISPLAY("item_display", ItemDisplay.class, -1),
SNIFFER("sniffer", Sniffer.class, -1),
TEXT_DISPLAY("text_display", TextDisplay.class, -1),
@MinecraftExperimental(Requires.UPDATE_1_21)
@ApiStatus.Experimental
BREEZE("breeze", Breeze.class, -1),
@MinecraftExperimental(Requires.UPDATE_1_21)
@ApiStatus.Experimental
WIND_CHARGE("wind_charge", WindCharge.class, -1),
@MinecraftExperimental(Requires.UPDATE_1_21)
@ApiStatus.Experimental
BREEZE_WIND_CHARGE("breeze_wind_charge", BreezeWindCharge.class, -1),
ARMADILLO("armadillo", Armadillo.class, -1),
@MinecraftExperimental(Requires.UPDATE_1_21)
@ApiStatus.Experimental
BOGGED("bogged", Bogged.class, -1),
@MinecraftExperimental(Requires.UPDATE_1_21)
@ApiStatus.Experimental
OMINOUS_ITEM_SPAWNER("ominous_item_spawner", OminousItemSpawner.class, -1),
/**
* A fishing line and bobber.

View File

@@ -1,7 +1,5 @@
package org.bukkit.entity;
import org.bukkit.MinecraftExperimental;
import org.bukkit.MinecraftExperimental.Requires;
import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.Nullable;
@@ -9,7 +7,6 @@ import org.jetbrains.annotations.Nullable;
/**
* Represents an ominous item spawner.
*/
@MinecraftExperimental(Requires.UPDATE_1_21)
@ApiStatus.Experimental
public interface OminousItemSpawner extends Entity {

View File

@@ -21,6 +21,7 @@ import org.bukkit.Note;
import org.bukkit.OfflinePlayer;
import org.bukkit.Particle;
import org.bukkit.Server;
import org.bukkit.ServerLinks;
import org.bukkit.Sound;
import org.bukkit.SoundCategory;
import org.bukkit.WeatherType;
@@ -184,7 +185,6 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* null value.
*/
@NotNull
@ApiStatus.Experimental
CompletableFuture<byte[]> retrieveCookie(@NotNull NamespacedKey key);
/**
@@ -194,7 +194,6 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param value the data to store in the cookie
* @throws IllegalStateException if a cookie cannot be stored at this time
*/
@ApiStatus.Experimental
void storeCookie(@NotNull NamespacedKey key, @NotNull byte[] value);
/**
@@ -206,7 +205,6 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @throws IllegalStateException if a transfer cannot take place at this
* time
*/
@ApiStatus.Experimental
void transfer(@NotNull String host, int port);
/**
@@ -1015,6 +1013,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
public void sendHurtAnimation(float yaw);
/**
* Sends the given server links to the player.
*
* @param links links to send
*/
public void sendLinks(@NotNull ServerLinks links);
/**
* Add custom chat completion suggestions shown to the player while typing a
* message.

View File

@@ -1,13 +1,10 @@
package org.bukkit.entity;
import org.bukkit.MinecraftExperimental;
import org.bukkit.MinecraftExperimental.Requires;
import org.jetbrains.annotations.ApiStatus;
/**
* Represents a Wind Charge.
*/
@MinecraftExperimental(Requires.UPDATE_1_21)
@ApiStatus.Experimental
public interface WindCharge extends AbstractWindCharge {