Updated Upstream (Bukkit/CraftBukkit) (#10242)

* Updated Upstream (Bukkit/CraftBukkit)

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:
a6a9d2a4 Remove some old ApiStatus.Experimental annotations
be72314c SPIGOT-7300, PR-829: Add new DamageSource API providing enhanced information about entity damage
b252cf05 SPIGOT-7576, PR-970: Add methods in MushroomCow to change stew effects
b1c689bd PR-902: Add Server#isLoggingIPs to get log-ips configuration
08f86d1c PR-971: Add Player methods for client-side potion effects
2e3024a9 PR-963: Add API for in-world structures
a23292a7 SPIGOT-7530, PR-948: Improve Resource Pack API with new 1.20.3 functionality
1851857b SPIGOT-3071, PR-969: Add entity spawn method with spawn reason
cde4c52a SPIGOT-5553, PR-964: Add EntityKnockbackEvent

CraftBukkit Changes:
38fd4bd50 Fix accidentally renamed internal damage method
80f0ce4be SPIGOT-7300, PR-1180: Add new DamageSource API providing enhanced information about entity damage
7e43f3b16 SPIGOT-7581: Fix typo in BlockMushroom
ea14b7d90 SPIGOT-7576, PR-1347: Add methods in MushroomCow to change stew effects
4c687f243 PR-1259: Add Server#isLoggingIPs to get log-ips configuration
22a541a29 Improve support for per-world game rules
cb7dccce2 PR-1348: Add Player methods for client-side potion effects
b8d6109f0 PR-1335: Add API for in-world structures
4398a1b5b SPIGOT-7577: Make CraftWindCharge#explode discard the entity
e74107678 Fix Crafter maximum stack size
0bb0f4f6a SPIGOT-7530, PR-1314: Improve Resource Pack API with new 1.20.3 functionality
4949f556d SPIGOT-3071, PR-1345: Add entity spawn method with spawn reason
20ac73ca2 PR-1353: Fix Structure#place not working as documented with 0 palette
3c1b77871 SPIGOT-6911, PR-1349: Change max book length in CraftMetaBook
333701839 SPIGOT-7572: Bee nests generated without bees
f48f4174c SPIGOT-5553, PR-1336: Add EntityKnockbackEvent

patches/server/0981-Add-experience-points-API.patch

@@ -1,73 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lukas Planz <lukas.planz@web.de>
-Date: Tue, 5 Sep 2023 20:34:20 +0200
-Subject: [PATCH] Add experience points API
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index eb6a4518d3919cacc3b7a83870c0f0e87eba3f6e..d8ef2466e235b8121dd04bde0800ed2dbf8e370c 100644
---- a/src/main/java/net/minecraft/world/entity/player/Player.java
-+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -1825,7 +1825,7 @@ public abstract class Player extends LivingEntity {
-     }
- 
-     public int getXpNeededForNextLevel() {
--        return this.experienceLevel >= 30 ? 112 + (this.experienceLevel - 30) * 9 : (this.experienceLevel >= 15 ? 37 + (this.experienceLevel - 15) * 5 : 7 + this.experienceLevel * 2);
-+        return this.experienceLevel >= 30 ? 112 + (this.experienceLevel - 30) * 9 : (this.experienceLevel >= 15 ? 37 + (this.experienceLevel - 15) * 5 : 7 + this.experienceLevel * 2); // Paper - diff on change; calculateTotalExperiencePoints
-     }
-     // Paper start - send while respecting visibility
-     private static void sendSoundEffect(Player fromEntity, double x, double y, double z, SoundEvent soundEffect, SoundSource soundCategory, float volume, float pitch) {
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index cd58b5e338ece695cddab37b5bcce730b04dc63d..a85f7f56bdabe246ce47ab83f4000bd779cf5c3b 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1794,6 +1794,49 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-         Preconditions.checkArgument(exp >= 0, "Total experience points must not be negative (%s)", exp);
-         this.getHandle().totalExperience = exp;
-     }
-+    // Paper start
-+    @Override
-+    public int calculateTotalExperiencePoints() {
-+        return calculateTotalExperiencePoints(this.getLevel()) + Math.round(this.getExperiencePointsNeededForNextLevel() * getExp());
-+    }
-+
-+    @Override
-+    public void setExperienceLevelAndProgress(final int totalExperience) {
-+        Preconditions.checkArgument(totalExperience >= 0, "Total experience points must not be negative (%s)", totalExperience);
-+        int level = calculateLevelsForExperiencePoints(totalExperience);
-+        int remainingPoints = totalExperience - calculateTotalExperiencePoints(level);
-+
-+        this.getHandle().experienceLevel = level;
-+        this.getHandle().experienceProgress = (float) remainingPoints / this.getExperiencePointsNeededForNextLevel();
-+        this.getHandle().lastSentExp = -1;
-+    }
-+
-+    @Override
-+    public int getExperiencePointsNeededForNextLevel() {
-+        return this.getHandle().getXpNeededForNextLevel();
-+    }
-+
-+    // See https://minecraft.wiki/w/Experience#Leveling_up for reference
-+    private int calculateTotalExperiencePoints(int level) {
-+        if (level <= 16) {
-+            return (int) (Math.pow(level, 2) + 6 * level);
-+        } else if (level <= 31) {
-+            return (int) (2.5 * Math.pow(level, 2) - 40.5 * level + 360.0);
-+        } else {
-+            return (int) (4.5 * Math.pow(level, 2) - 162.5 * level + 2220.0);
-+        }
-+    }
-+
-+    private int calculateLevelsForExperiencePoints(int points) {
-+        if (points <= 352) { // Level 0-16
-+            return (int) Math.floor(Math.sqrt(points + 9) - 3);
-+        } else if (points <= 1507) { // Level 17-31
-+            return (int) Math.floor(8.1 + Math.sqrt(0.4 * (points - (7839.0 / 40.0))));
-+        } else { // 32+
-+            return (int) Math.floor((325.0 / 18.0) + Math.sqrt((2.0 / 9.0) * (points - (54215.0 / 72.0))));
-+        }
-+    }
-+    // Paper end
- 
-     @Override
-     public void sendExperienceChange(float progress) {