more misc changes

Author: Lulu13022002

paper-api/src/main/java/com/destroystokyo/paper/network/NetworkClient.java

@@ -21,7 +21,7 @@ public interface NetworkClient {
      * Returns the protocol version of the client.
      *
      * @return The client's protocol version, or {@code -1} if unknown
-     * @see <a href="http://wiki.vg/Protocol_version_numbers">List of protocol
+     * @see <a href="https://minecraft.wiki/w/Minecraft_Wiki:Projects/wiki.vg_merge/Protocol_version_numbers">List of protocol
      *     version numbers</a>
      */
     int getProtocolVersion();

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

@@ -1686,7 +1686,7 @@ private static Sound getSound(@NotNull String key) {
      * @deprecated only for backwards compatibility, use {@link Registry#get(NamespacedKey)} instead.
      */
     @NotNull
-    @Deprecated(since = "1.21.3")
+    @Deprecated(since = "1.21.3", forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.22") // Paper - will be removed via asm-utils
     static Sound valueOf(@NotNull String name) {
         Sound sound = Bukkit.getUnsafe().get(RegistryKey.SOUND_EVENT, NamespacedKey.fromString(name.toLowerCase(Locale.ROOT)));
         if (sound != null) {
@@ -1720,7 +1720,7 @@ static Sound valueOf(@NotNull String name) {
      * @deprecated use {@link Registry#iterator()}.
      */
     @NotNull
-    @Deprecated(since = "1.21.3")
+    @Deprecated(since = "1.21.3", forRemoval = true) @org.jetbrains.annotations.ApiStatus.ScheduledForRemoval(inVersion = "1.22") // Paper - will be removed via asm-utils
     static Sound[] values() {
         return Lists.newArrayList(Registry.SOUNDS).toArray(new Sound[0]);
     }

paper-api/src/main/java/org/bukkit/attribute/AttributeModifier.java

@@ -130,7 +130,6 @@ public Operation getOperation() {
      */
     @Nullable
     @Deprecated(since = "1.20.5")
-    @io.papermc.paper.annotation.DoNotUse // Paper
     public EquipmentSlot getSlot() {
         return slot == EquipmentSlotGroup.ANY ? null : slot.getExample();
     }

paper-api/src/main/java/org/bukkit/event/block/BlockCanBuildEvent.java

@@ -38,11 +38,11 @@ public BlockCanBuildEvent(@NotNull final Block block, @NotNull final BlockData t
      * @param type the id of the block to place
      * @param canBuild whether we can build
      */
-    @java.lang.Deprecated // Paper
-    @io.papermc.paper.annotation.DoNotUse // Paper
+    @Deprecated // Paper
     public BlockCanBuildEvent(@NotNull final Block block, @Nullable final Player player, @NotNull final BlockData type, final boolean canBuild) {
         this(block, player, type, canBuild, org.bukkit.inventory.EquipmentSlot.HAND); // Paper start - expose hand
     }
+
     @org.jetbrains.annotations.ApiStatus.Internal
     public BlockCanBuildEvent(@NotNull final Block block, @Nullable final Player player, @NotNull final BlockData type, final boolean canBuild, @NotNull final org.bukkit.inventory.EquipmentSlot hand) { // Paper end - expose hand
         super(block);

paper-api/src/main/java/org/bukkit/event/block/BlockDamageEvent.java

@@ -23,7 +23,6 @@ public class BlockDamageEvent extends BlockEvent implements Cancellable {
 
     // Paper start - expose blockface
     @Deprecated(forRemoval = true)
-    @io.papermc.paper.annotation.DoNotUse
     public BlockDamageEvent(@NotNull final Player player, @NotNull final Block block, @NotNull final ItemStack itemInHand, final boolean instaBreak) {
         this(player, block, null, itemInHand, instaBreak); // Some plugin do bad things...
     }

paper-api/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java

@@ -37,7 +37,7 @@ public EntityDamageEvent(@NotNull final Entity damagee, @NotNull final DamageCau
     }
 
     public EntityDamageEvent(@NotNull final Entity damagee, @NotNull final DamageCause cause, @NotNull final DamageSource damageSource, final double damage) {
-        this(damagee, cause, damageSource, new EnumMap<DamageModifier, Double>(ImmutableMap.of(DamageModifier.BASE, damage)), new EnumMap<DamageModifier, Function<? super Double, Double>>(ImmutableMap.of(DamageModifier.BASE, ZERO)));
+        this(damagee, cause, damageSource, new EnumMap<>(ImmutableMap.of(DamageModifier.BASE, damage)), new EnumMap<DamageModifier, Function<? super Double, Double>>(ImmutableMap.of(DamageModifier.BASE, ZERO)));
     }
 
     @Deprecated(since = "1.20.4", forRemoval = true)
@@ -52,7 +52,7 @@ public EntityDamageEvent(@NotNull final Entity damagee, @NotNull final DamageCau
         Preconditions.checkArgument(modifiers.values().stream().allMatch(Objects::nonNull), "Cannot have null modifier values");
         Preconditions.checkArgument(modifiers.keySet().equals(modifierFunctions.keySet()), "Must have a modifier function for each DamageModifier");
         Preconditions.checkArgument(modifierFunctions.values().stream().allMatch(Objects::nonNull), "Cannot have null modifier function");
-        this.originals = new EnumMap<DamageModifier, Double>(modifiers);
+        this.originals = new EnumMap<>(modifiers);
         this.cause = cause;
         this.modifiers = modifiers;
         this.modifierFunctions = modifierFunctions;
@@ -236,9 +236,7 @@ public static HandlerList getHandlerList() {
      * An enum to specify the types of modifier
      *
      * @deprecated This API is responsible for a large number of implementation
-     * problems and is in general unsustainable to maintain. It is likely to be
-     * removed very soon in a subsequent release. Please see
-     * <a href="https://www.spigotmc.org/threads/194446/">this thread</a> for more information.
+     * problems and is in general unsustainable to maintain.
      */
     @Deprecated(since = "1.12")
     public enum DamageModifier {

paper-api/src/main/java/org/bukkit/event/entity/EntityPortalEnterEvent.java

@@ -15,11 +15,12 @@ public class EntityPortalEnterEvent extends EntityEvent implements org.bukkit.ev
     private static final HandlerList handlers = new HandlerList();
     private final Location location;
 
-    @Deprecated(since = "1.21") @io.papermc.paper.annotation.DoNotUse // Paper
+    @Deprecated(since = "1.21")
     public EntityPortalEnterEvent(@NotNull final Entity entity, @NotNull final Location location) {
         // Paper start
         this(entity, location, org.bukkit.PortalType.CUSTOM);
     }
+
     @org.jetbrains.annotations.ApiStatus.Internal
     public EntityPortalEnterEvent(@NotNull final Entity entity, @NotNull final Location location, @NotNull final org.bukkit.PortalType portalType) {
         // Paper end

paper-api/src/main/java/org/bukkit/event/entity/ProjectileHitEvent.java

@@ -19,22 +19,22 @@ public class ProjectileHitEvent extends EntityEvent implements Cancellable {
     private final BlockFace hitFace;
     private boolean cancel = false;
 
-    @Deprecated @io.papermc.paper.annotation.DoNotUse // Paper
+    @Deprecated // Paper
     public ProjectileHitEvent(@NotNull final Projectile projectile) {
         this(projectile, null, null, null); // Paper
     }
 
-    @Deprecated @io.papermc.paper.annotation.DoNotUse // Paper
+    @Deprecated // Paper
     public ProjectileHitEvent(@NotNull final Projectile projectile, @Nullable Entity hitEntity) {
         this(projectile, hitEntity, null, null); // Paper
     }
 
-    @Deprecated @io.papermc.paper.annotation.DoNotUse // Paper
+    @Deprecated // Paper
     public ProjectileHitEvent(@NotNull final Projectile projectile, @Nullable Block hitBlock) {
         this(projectile, null, hitBlock, null); // Paper
     }
 
-    @Deprecated @io.papermc.paper.annotation.DoNotUse // Paper
+    @Deprecated // Paper
     public ProjectileHitEvent(@NotNull final Projectile projectile, @Nullable Entity hitEntity, @Nullable Block hitBlock) {
         this(projectile, hitEntity, hitBlock, null);
     }

paper-server/patches/sources/net/minecraft/core/dispenser/BoatDispenseItemBehavior.java.patch

@@ -1,30 +1,27 @@
 --- a/net/minecraft/core/dispenser/BoatDispenseItemBehavior.java
 +++ b/net/minecraft/core/dispenser/BoatDispenseItemBehavior.java
-@@ -40,13 +_,39 @@
+@@ -40,13 +_,36 @@
              d4 = 0.0;
          }
 
 +        // CraftBukkit start
-+        ItemStack singleItemStack = item.copyWithCount(1); // Paper - shrink at end and single item in event
++        ItemStack singleItemStack = item.copyWithCount(1);
 +        org.bukkit.block.Block block = org.bukkit.craftbukkit.block.CraftBlock.at(serverLevel, blockSource.pos());
 +        org.bukkit.craftbukkit.inventory.CraftItemStack craftItem = org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(singleItemStack);
 +
 +        org.bukkit.event.block.BlockDispenseEvent event = new org.bukkit.event.block.BlockDispenseEvent(block, craftItem.clone(), new org.bukkit.util.Vector(d1, d2 + d4, d3));
-+        if (!DispenserBlock.eventFired) {
-+            serverLevel.getCraftServer().getPluginManager().callEvent(event);
-+        }
++        serverLevel.getCraftServer().getPluginManager().callEvent(event);
 +
 +        if (event.isCancelled()) {
-+            // stack.grow(1); // Paper - shrink below
 +            return item;
 +        }
 +
-+        boolean shrink = true; // Paper
++        boolean shrink = true;
 +        if (!event.getItem().equals(craftItem)) {
-+            shrink = false; // Paper - shrink below
++            shrink = false;
 +            // Chain to handler for new item
 +            ItemStack eventStack = org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(event.getItem());
-+            DispenseItemBehavior dispenseBehavior = DispenserBlock.getDispenseBehavior(blockSource, eventStack); // Paper - Fix NPE with equippable and items without behavior
++            DispenseItemBehavior dispenseBehavior = DispenserBlock.getDispenseBehavior(blockSource, eventStack);
 +            if (dispenseBehavior != DispenseItemBehavior.NOOP && dispenseBehavior != this) {
 +                dispenseBehavior.dispense(blockSource, eventStack);
 +                return item;

paper-server/patches/sources/net/minecraft/core/dispenser/DefaultDispenseItemBehavior.java.patch

@@ -1,20 +1,11 @@
 --- a/net/minecraft/core/dispenser/DefaultDispenseItemBehavior.java
 +++ b/net/minecraft/core/dispenser/DefaultDispenseItemBehavior.java
-@@ -10,23 +_,46 @@
+@@ -9,24 +_,37 @@
+ 
  public class DefaultDispenseItemBehavior implements DispenseItemBehavior {
      private static final int DEFAULT_ACCURACY = 6;
- 
-+    // CraftBukkit start
 +    private Direction direction; // Paper - cache facing direction
-+    private boolean dropper;
-+
-+    public DefaultDispenseItemBehavior(boolean dropper) {
-+        this.dropper = dropper;
-+    }
-+
-+    public DefaultDispenseItemBehavior() {}
-+    // CraftBukkit end
-+
+ 
      @Override
      public final ItemStack dispense(BlockSource blockSource, ItemStack item) {
 +        this.direction = blockSource.state().getValue(DispenserBlock.FACING); // Paper - cache facing direction
@@ -32,7 +23,7 @@
          ItemStack itemStack = item.split(1);
 -        spawnItem(blockSource.level(), itemStack, 6, direction, dispensePosition);
 +        // CraftBukkit start
-+        if (!DefaultDispenseItemBehavior.spawnItem(blockSource.level(), itemStack, 6, this.direction, dispensePosition, blockSource, this.dropper)) {
++        if (!DefaultDispenseItemBehavior.spawnItem(blockSource.level(), itemStack, 6, this.direction, dispensePosition, blockSource)) {
 +            item.grow(1);
 +        }
 +        // CraftBukkit end
@@ -50,25 +41,23 @@
          double d = position.x();
          double d1 = position.y();
          double d2 = position.z();
-@@ -43,7 +_,45 @@
+@@ -43,7 +_,43 @@
              level.random.triangle(0.2, 0.0172275 * speed),
              level.random.triangle(facing.getStepZ() * d3, 0.0172275 * speed)
          );
 +        return itemEntity; // CraftBukkit
 +    }
 +
-+    // CraftBukkit - void -> boolean return, IPosition -> ISourceBlock last argument, dropper
-+    public static boolean spawnItem(Level level, ItemStack stack, int speed, Direction facing, Position dispensePosition, BlockSource blockSource, boolean dropper) {
++    // CraftBukkit start - void -> boolean return
++    public static boolean spawnItem(Level level, ItemStack stack, int speed, Direction facing, Position position, BlockSource blockSource) {
 +        if (stack.isEmpty()) return true;
-+        ItemEntity itemEntity = DefaultDispenseItemBehavior.prepareItem(level, stack, speed, facing, dispensePosition);
++        ItemEntity itemEntity = DefaultDispenseItemBehavior.prepareItem(level, stack, speed, facing, position);
 +
 +        org.bukkit.block.Block block = org.bukkit.craftbukkit.block.CraftBlock.at(level, blockSource.pos());
 +        org.bukkit.craftbukkit.inventory.CraftItemStack craftItem = org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(stack);
 +
 +        org.bukkit.event.block.BlockDispenseEvent event = new org.bukkit.event.block.BlockDispenseEvent(block, craftItem.clone(), org.bukkit.craftbukkit.util.CraftVector.toBukkit(itemEntity.getDeltaMovement()));
-+        if (!DispenserBlock.eventFired) {
-+            level.getCraftServer().getPluginManager().callEvent(event);
-+        }
++        level.getCraftServer().getPluginManager().callEvent(event);
 +
 +        if (event.isCancelled()) {
 +            return false;
@@ -77,10 +66,10 @@
 +        itemEntity.setItem(org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(event.getItem()));
 +        itemEntity.setDeltaMovement(org.bukkit.craftbukkit.util.CraftVector.toVec3(event.getVelocity()));
 +
-+        if (!dropper && !event.getItem().getType().equals(craftItem.getType())) {
++        if (blockSource.state().is(net.minecraft.world.level.block.Blocks.DISPENSER) && !event.getItem().getType().equals(craftItem.getType())) {
 +            // Chain to handler for new item
 +            ItemStack eventStack = org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(event.getItem());
-+            DispenseItemBehavior dispenseBehavior = DispenserBlock.getDispenseBehavior(blockSource, eventStack); // Paper - Fix NPE with equippable and items without behavior
++            DispenseItemBehavior dispenseBehavior = DispenserBlock.getDispenseBehavior(blockSource, eventStack);
 +            if (dispenseBehavior != DispenseItemBehavior.NOOP && dispenseBehavior.getClass() != DefaultDispenseItemBehavior.class) {
 +                dispenseBehavior.dispense(blockSource, eventStack);
 +            } else {