misc changes

Author: Lulu13022002

build-data/paper.at

@@ -190,6 +190,9 @@ public net.minecraft.world.entity.Entity FLAG_INVISIBLE
 public net.minecraft.world.entity.Entity getEncodeId()Ljava/lang/String;
 public net.minecraft.world.entity.Entity getFireImmuneTicks()I
 public net.minecraft.world.entity.Entity getSharedFlag(I)Z
+public net.minecraft.world.entity.Entity getSwimSound()Lnet/minecraft/sounds/SoundEvent;
+public net.minecraft.world.entity.Entity getSwimSoundgetSwimSplashSound()Lnet/minecraft/sounds/SoundEvent;
+public net.minecraft.world.entity.Entity getSwimSplashSound()Lnet/minecraft/sounds/SoundEvent;
 public net.minecraft.world.entity.Entity hasVisualFire
 public net.minecraft.world.entity.Entity isAffectedByBlocks()Z
 public net.minecraft.world.entity.Entity isInBubbleColumn()Z
@@ -440,6 +443,7 @@ public net.minecraft.world.entity.projectile.AbstractArrow getPickupItem()Lnet/m
 public net.minecraft.world.entity.projectile.AbstractArrow isInGround()Z
 public net.minecraft.world.entity.projectile.AbstractArrow life
 public net.minecraft.world.entity.projectile.AbstractArrow pickupItemStack
+public net.minecraft.world.entity.projectile.AbstractArrow setPickupItemStack(Lnet/minecraft/world/item/ItemStack;)V
 public net.minecraft.world.entity.projectile.AbstractArrow setPierceLevel(B)V
 public net.minecraft.world.entity.projectile.AbstractHurtingProjectile assignDirectionalMovement(Lnet/minecraft/world/phys/Vec3;D)V
 public net.minecraft.world.entity.projectile.Arrow NO_EFFECT_COLOR
@@ -481,6 +485,7 @@ public net.minecraft.world.entity.projectile.ShulkerBullet targetDeltaX
 public net.minecraft.world.entity.projectile.ShulkerBullet targetDeltaY
 public net.minecraft.world.entity.projectile.ShulkerBullet targetDeltaZ
 public net.minecraft.world.entity.projectile.SpectralArrow duration
+public net.minecraft.world.entity.projectile.ThrowableItemProjectile getDefaultItem()Lnet/minecraft/world/item/Item;
 public net.minecraft.world.entity.projectile.ThrownPotion isLingering()Z
 public net.minecraft.world.entity.projectile.ThrownTrident dealtDamage
 public net.minecraft.world.entity.projectile.windcharge.AbstractWindCharge explode(Lnet/minecraft/world/phys/Vec3;)V

paper-api/src/main/java/io/papermc/paper/brigadier/PaperBrigadier.java

@@ -9,6 +9,7 @@
 
 /**
  * Helper methods to bridge the gaps between Brigadier and Paper-MojangAPI.
+ *
  * @deprecated for removal. See {@link MessageComponentSerializer} for a direct replacement of functionality found in
  * this class.
  * As a general entrypoint to brigadier on paper, see {@link io.papermc.paper.command.brigadier.Commands}.

paper-api/src/main/java/org/bukkit/Bukkit.java

@@ -14,6 +14,7 @@
 import java.util.UUID;
 import java.util.function.Consumer;
 import java.util.logging.Logger;
+import net.kyori.adventure.text.Component;
 import org.bukkit.Warning.WarningState;
 import org.bukkit.advancement.Advancement;
 import org.bukkit.block.data.BlockData;
@@ -189,8 +190,8 @@ public static String getMinecraftVersion() {
      * uses. Normal and immediate iterator use without consequences that
      * affect the collection are fully supported. The effects following
      * (non-exhaustive) {@link Entity#teleport(Location) teleportation},
-     * {@link Player#setHealth(double) death}, and {@link Player#kickPlayer(
-     * String) kicking} are undefined. Any use of this collection from
+     * {@link Player#setHealth(double) death}, and {@link Player#kick(
+     * Component) kicking} are undefined. Any use of this collection from
      * asynchronous threads is unsafe.
      * <p>
      * For safe consequential iteration or mimicking the old array behavior,
@@ -468,7 +469,7 @@ public static void reloadWhitelist() {
      *
      * @param message the message
      * @return the number of players
-     * @deprecated in favour of {@link Server#broadcast(net.kyori.adventure.text.Component)}
+     * @deprecated in favour of {@link Server#broadcast(Component)}
      */
     @Deprecated // Paper
     public static int broadcastMessage(@NotNull String message) {
@@ -480,7 +481,7 @@ public static int broadcastMessage(@NotNull String message) {
      * Sends the component to all online players.
      *
      * @param component the component to send
-     * @deprecated use {@code sendMessage} methods on {@link #getServer()} that accept {@link net.kyori.adventure.text.Component}
+     * @deprecated use {@code sendMessage} methods on {@link #getServer()} that accept {@link Component}
      */
     @Deprecated
     public static void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent component) {
@@ -491,7 +492,7 @@ public static void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent com
      * Sends an array of components as a single message to all online players.
      *
      * @param components the components to send
-     * @deprecated use {@code sendMessage} methods on {@link #getServer()} that accept {@link net.kyori.adventure.text.Component}
+     * @deprecated use {@code sendMessage} methods on {@link #getServer()} that accept {@link Component}
      */
     @Deprecated
     public static void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
@@ -1461,7 +1462,7 @@ public static void shutdown() {
     /**
      * Broadcast a message to all players.
      * <p>
-     * This is the same as calling {@link #broadcast(net.kyori.adventure.text.Component,
+     * This is the same as calling {@link #broadcast(Component,
      * java.lang.String)} with the {@link Server#BROADCAST_CHANNEL_USERS} permission.
      *
      * @param message the message
@@ -1491,7 +1492,7 @@ public static int broadcast(net.kyori.adventure.text.@NotNull Component message,
      * @param permission the required permission {@link Permissible
      *     permissibles} must have to receive the broadcast
      * @return number of message recipients
-     * @deprecated in favour of {@link #broadcast(net.kyori.adventure.text.Component, String)}
+     * @deprecated in favour of {@link #broadcast(Component, String)}
      */
     @Deprecated // Paper
     public static int broadcast(@NotNull String message, @NotNull String permission) {
@@ -1739,7 +1740,7 @@ public static ConsoleCommandSender getConsoleSender() {
      * @return a command sender
      */
     @NotNull
-    public static CommandSender createCommandSender(final @NotNull java.util.function.Consumer<? super net.kyori.adventure.text.Component> feedback) {
+    public static CommandSender createCommandSender(final @NotNull java.util.function.Consumer<? super Component> feedback) {
         return server.createCommandSender(feedback);
     }
     // Paper end
@@ -1863,7 +1864,7 @@ public static Inventory createInventory(@Nullable InventoryHolder owner, @NotNul
      * @return The new inventory.
      * @throws IllegalArgumentException if the {@link InventoryType} cannot be
      * viewed.
-     * @deprecated in favour of {@link #createInventory(InventoryHolder, InventoryType, net.kyori.adventure.text.Component)}
+     * @deprecated in favour of {@link #createInventory(InventoryHolder, InventoryType, Component)}
      *
      * @see InventoryType#isCreatable()
      */
@@ -1915,7 +1916,7 @@ public static Inventory createInventory(@Nullable InventoryHolder owner, int siz
      *     viewed
      * @return a new inventory
      * @throws IllegalArgumentException if the size is not a multiple of 9
-     * @deprecated in favour of {@link #createInventory(InventoryHolder, InventoryType, net.kyori.adventure.text.Component)}
+     * @deprecated in favour of {@link #createInventory(InventoryHolder, InventoryType, Component)}
      */
     @Deprecated // Paper
     @NotNull
@@ -1944,7 +1945,7 @@ public static Inventory createInventory(@Nullable InventoryHolder owner, int siz
      * @param title the title of the corresponding merchant inventory, displayed
      * when the merchant inventory is viewed
      * @return a new merchant
-     * @deprecated in favour of {@link #createMerchant(net.kyori.adventure.text.Component)}. The title parameter is
+     * @deprecated in favour of {@link #createMerchant(Component)}. The title parameter is
      * no-longer needed when used with {@link MenuType#MERCHANT} and {@link MenuType.Typed#builder()}
      */
     @NotNull
@@ -2081,7 +2082,7 @@ public static boolean isPrimaryThread() {
      *
      * @return the server's MOTD
      */
-    @NotNull public static net.kyori.adventure.text.Component motd() {
+    @NotNull public static Component motd() {
         return server.motd();
     }
 
@@ -2120,7 +2121,7 @@ public static String getMotd() {
      * Set the message that is displayed on the server list.
      *
      * @param motd The message to be displayed
-     * @deprecated in favour of {@link #motd(net.kyori.adventure.text.Component)}
+     * @deprecated in favour of {@link #motd(Component)}
      */
     @Deprecated // Paper
     public static void setMotd(@NotNull String motd) {
@@ -2694,7 +2695,7 @@ public static String getPermissionMessage() {
      * @return the default message
      */
     @NotNull
-    public static net.kyori.adventure.text.Component permissionMessage() {
+    public static Component permissionMessage() {
         return server.permissionMessage();
     }
 

paper-api/src/main/java/org/bukkit/EntityEffect.java

@@ -458,9 +458,7 @@ public enum EntityEffect {
      */
     BREAK_EQUIPMENT_BODY(65, LivingEntity.class),
     /**
-     * A creaking transient shaking when being hit.
-     * Does not apply to plain creaking entities as they are not invulnerable like the transient ones spawned by the
-     * creaking heart.
+     * A creaking shaking when being hit.
      */
     SHAKE(66, Creaking.class);
 

paper-api/src/main/java/org/bukkit/OfflinePlayer.java

@@ -257,7 +257,10 @@ public default BanEntry banPlayer(@Nullable String reason, java.util.@Nullable D
      */
     @Nullable
     @Deprecated(since = "1.20.4")
-    public Location getBedSpawnLocation();
+    default Location getBedSpawnLocation() {
+        return this.getRespawnLocation();
+    }
+
     // Paper start
     /**
      * Gets the last date and time that this player logged into the server.

paper-api/src/main/java/org/bukkit/Server.java

@@ -151,8 +151,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      * uses. Normal and immediate iterator use without consequences that
      * affect the collection are fully supported. The effects following
      * (non-exhaustive) {@link Entity#teleport(Location) teleportation},
-     * {@link Player#setHealth(double) death}, and {@link Player#kickPlayer(
-     * String) kicking} are undefined. Any use of this collection from
+     * {@link Player#setHealth(double) death}, and {@link Player#kick(
+     * Component) kicking} are undefined. Any use of this collection from
      * asynchronous threads is unsafe.
      * <p>
      * For safe consequential iteration or mimicking the old array behavior,
@@ -387,7 +387,9 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      * @deprecated use {@link #broadcast(net.kyori.adventure.text.Component)}
      */
     @Deprecated // Paper
-    public int broadcastMessage(@NotNull String message);
+    default int broadcastMessage(@NotNull String message) {
+        return this.broadcast(message, BROADCAST_CHANNEL_USERS);
+    }
 
     // Paper start
     /**
@@ -1296,7 +1298,10 @@ default World getWorld(@NotNull NamespacedKey worldKey) {
      * @deprecated in favour of {@link #broadcast(net.kyori.adventure.text.Component, String)}
      */
     @Deprecated // Paper
-    public int broadcast(@NotNull String message, @NotNull String permission);
+    default int broadcast(@NotNull String message, @NotNull String permission) {
+        return this.broadcast(net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(message), permission);
+    }
+
     // Paper start
     /**
      * Broadcast a message to all players.
@@ -1307,7 +1312,9 @@ default World getWorld(@NotNull NamespacedKey worldKey) {
      * @param message the message
      * @return the number of players
      */
-    int broadcast(net.kyori.adventure.text.@NotNull Component message);
+    default int broadcast(net.kyori.adventure.text.@NotNull Component message) {
+        return this.broadcast(message, BROADCAST_CHANNEL_USERS);
+    }
 
     /**
      * Broadcasts the specified message to every user with the given

paper-api/src/main/java/org/bukkit/entity/Entity.java

@@ -337,7 +337,6 @@ final class Holder {
      */
     boolean isFrozen();
 
-    // Paper start - missing entity api
     /**
      * Sets whether the entity is invisible or not.
      * <p>
@@ -347,14 +346,14 @@ final class Holder {
      *
      * @param invisible If the entity is invisible
      */
-    void setInvisible(boolean invisible); // Paper - moved up from LivingEntity
+    void setInvisible(boolean invisible);
 
     /**
      * Gets whether the entity is invisible or not.
      *
      * @return Whether the entity is invisible
      */
-    boolean isInvisible(); // Paper - moved up from LivingEntity
+    boolean isInvisible();
 
     /**
      * Sets this entities no physics status.
@@ -369,9 +368,7 @@ final class Holder {
      * @return true if the entity does not have physics.
      */
     boolean hasNoPhysics();
-    // Paper end - missing entity api
 
-    // Paper start - Freeze Tick Lock API
     /**
      * Gets if the entity currently has its freeze ticks locked
      * to a set amount.
@@ -389,12 +386,11 @@ final class Holder {
      * @param locked prevent vanilla modification or not
      */
     void lockFreezeTicks(boolean locked);
-    // Paper end - Freeze Tick Lock API
 
     /**
      * Mark the entity's removal.
      *
-     * @throws UnsupportedOperationException if you try to remove a {@link Player} use {@link Player#kickPlayer(String)} in this case instead
+     * @throws UnsupportedOperationException if you try to remove a {@link Player} use {@link Player#kick(net.kyori.adventure.text.Component)} in this case instead
      */
     public void remove();
 

paper-api/src/main/java/org/bukkit/entity/HumanEntity.java

@@ -299,16 +299,16 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
     /**
      * Force-closes the currently open inventory view for this player, if any.
      */
-    public void closeInventory();
+    default void closeInventory() {
+        this.closeInventory(org.bukkit.event.inventory.InventoryCloseEvent.Reason.PLUGIN);
+    }
 
-    // Paper start
     /**
      * Force-closes the currently open inventory view for this player, if any.
      *
      * @param reason why the inventory is closing
      */
-    public void closeInventory(org.bukkit.event.inventory.InventoryCloseEvent.Reason reason);
-    // Paper end
+    void closeInventory(org.bukkit.event.inventory.InventoryCloseEvent.Reason reason);
 
     /**
      * Returns the ItemStack currently in your hand, can be empty.

paper-api/src/main/java/org/bukkit/entity/LivingEntity.java

@@ -1056,22 +1056,6 @@ default void setArrowsInBody(final int count) {
     @Deprecated(since = "1.20.5", forRemoval = true) @org.jetbrains.annotations.Contract("-> fail") // Paper
     public EntityCategory getCategory();
 
-    /**
-     * Sets whether the entity is invisible or not.
-     *
-     * @param invisible If the entity is invisible
-     */
-    @Override // Paper - move invisibility up to Entity
-    public void setInvisible(boolean invisible);
-
-    /**
-     * Gets whether the entity is invisible or not.
-     *
-     * @return Whether the entity is invisible
-     */
-    @Override // Paper - move invisibility up to Entity
-    public boolean isInvisible();
-
     /**
      * Get the number of arrows stuck in this entity
      * @return Number of arrows stuck