Updated Upstream (Paper 1.21.3)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@2ef589c okaaay let's go
PaperMC/Paper@d0028b7 you saw nothing
PaperMC/Paper@e080b20 Bundles are no longer experimental (thanks lynx)
PaperMC/Paper@d280061 First batch of server patches
PaperMC/Paper@3585434 first 100!
PaperMC/Paper@6b27267 oops
PaperMC/Paper@152e82c Some work
PaperMC/Paper@9e92fed More work?
PaperMC/Paper@f1649d7 Work it
PaperMC/Paper@9d63c81 Work work work
PaperMC/Paper@dc5af48 Breakpoint before projectile mess
PaperMC/Paper@7c04a31 Update projectile launch to 1.21.2
PaperMC/Paper@a400929 242
PaperMC/Paper@8851d25 Fluid Flowing ifLoaded patch
PaperMC/Paper@f677393 Skip Improve-exact-choice-recipe-ingredients for now
PaperMC/Paper@5e262c1 298
PaperMC/Paper@aa37f72 Patches
PaperMC/Paper@af125d2 Patch
PaperMC/Paper@6bfc6db Patch
PaperMC/Paper@09b625e 400
PaperMC/Paper@1f8b537 440
PaperMC/Paper@f5177aa Some more work
PaperMC/Paper@2810f50 503
PaperMC/Paper@0bb4d1d 553
PaperMC/Paper@4db2503 Work work work work
PaperMC/Paper@cbf6416 A bunch of patches
PaperMC/Paper@6456b5d A bunch more 637
PaperMC/Paper@cb79de8 moooore
PaperMC/Paper@1dc1425 MOOOOORE
PaperMC/Paper@d52e2d2 MOOOOOOOORE
PaperMC/Paper@4baf9ab MOOOOOOOOOOORE
PaperMC/Paper@dd87f9f fix gruesome copyright violation
PaperMC/Paper@5a6011c MOOOOOOOOOOOOOORE
PaperMC/Paper@5d19e2b good luck americans
PaperMC/Paper@457d035 Patches, patches, patches
PaperMC/Paper@80de05f Patch me this, patch me that
PaperMC/Paper@26f7b4c Patch
PaperMC/Paper@89bf081 Patch
PaperMC/Paper@7d4cce9 Patch
PaperMC/Paper@b237528 Readd wrongly removed diff
PaperMC/Paper@fc05430 963
PaperMC/Paper@9047541 Upstream update
PaperMC/Paper@d67e55d Checkpoint
PaperMC/Paper@fe142cd Anti Xray
PaperMC/Paper@35e01d7 Update work 989
PaperMC/Paper@7616ebc 1000
PaperMC/Paper@6a31574 1020
PaperMC/Paper@227caac Wrong attempt at Tag lifecycle
PaperMC/Paper@afbb0d8 1037
PaperMC/Paper@b06e0b0 Work on compile errors
PaperMC/Paper@9c83387 Compile issues 1
PaperMC/Paper@0f011a3 Some more compile issues
PaperMC/Paper@6fb86bb Compiler issues v2
PaperMC/Paper@918ca96 Compiler issues v3
PaperMC/Paper@bb124f4 Compiler issues v4
PaperMC/Paper@0a8fd78 Compiler issue v5
PaperMC/Paper@e19f484 Test compile fixes
PaperMC/Paper@3518974 fix some issues
PaperMC/Paper@6df21e6 Start Moonrise update
PaperMC/Paper@47258a7 Move common diffs to MCUtils
PaperMC/Paper@ecf4d97 Begin fixing issues
PaperMC/Paper@8e569ba Merge patches
PaperMC/Paper@3b31621 Implement config hooks in PaperHooks
PaperMC/Paper@e9c58f5 Implement chunk tick iteration optimisations
PaperMC/Paper@2a95ad1 Implement explosion optimisations
PaperMC/Paper@16d2c9d Implement Starlight
PaperMC/Paper@3d7b570 Implement chunk system
PaperMC/Paper@1d341df Fix some compile errors from patches
PaperMC/Paper@6daedd7 Prepare rebase
PaperMC/Paper@75e3409 Complete rebase, start review
PaperMC/Paper@f1a11a6 Finish mixin diff review
PaperMC/Paper@a911f4a Prepare rebase
PaperMC/Paper@35ef293 Finish rebase
PaperMC/Paper@9ecf77e Fix compile issues
PaperMC/Paper@62e3bcd Review patch-to-patch diff
PaperMC/Paper@b711764 Rebase fixups
PaperMC/Paper@2e76d3f Specify mainCapabilityAttribute for paper-api
PaperMC/Paper@e4efb59 fix compile issues
PaperMC/Paper@683ce20 Fix Anti-Xray using wrong data in chunk deserialize
PaperMC/Paper@e92607c Fix MSPT command
PaperMC/Paper@dcd81a8 Fix crafting (and server icon)
PaperMC/Paper@61136fe Add max minecarft speed gamerule config
PaperMC/Paper@ba1ee87 Revert "Add max minecarft speed gamerule config"
PaperMC/Paper@cf03bed Add startup flag to disable gamerule limits
PaperMC/Paper@be2edea Fix boats/minecarts not dropping when destroyed
PaperMC/Paper@b14d336 Apply watchdoge patches
PaperMC/Paper@2946dbb Update WorldServer#serverlevelData mapping
PaperMC/Paper@98af0e0 update generator
PaperMC/Paper@20507b4 Apply more patches
PaperMC/Paper@7162ff0 fix item meta
PaperMC/Paper@7d67d3f fix DamageTypeTags init
PaperMC/Paper@0971875 re-add improve perf of mass crafts
PaperMC/Paper@bcf52fe Delete some old patches
PaperMC/Paper@348c855 Readd last API patch (with TODO)
PaperMC/Paper@b630564 More patches
PaperMC/Paper@3cb16c9 Add back per player mob spawning
PaperMC/Paper@fe7b741 Another one
PaperMC/Paper@12ed021 Update material tags and entity effect
PaperMC/Paper@02bca1e Remove timings impl
PaperMC/Paper@4d87302 Fix NPE and StackOverflowError for dispensers
PaperMC/Paper@f8f230a Remove unnecessary AT
PaperMC/Paper@29bf7be Fix unused parameter in PlayerList#remove
PaperMC/Paper@9e35192 Execute spark tasks during tick sleep (#11525)
PaperMC/Paper@e35f199 Use declaration order for state holder property iteration
PaperMC/Paper@6288adb Remove leftover missed timings calls (#11527)
PaperMC/Paper@99b1bf9 Use new ClientboundPlayerRotationPacket for setting player rotation
PaperMC/Paper@40211a0 Update Gradle wrapper to 8.10.2
PaperMC/Paper@49eae0d remove some leftovers
PaperMC/Paper@d576cfc cleanup bugfix patch
PaperMC/Paper@1196ab5 Avoid issues with certain tasks not processing during sleep (#11526)
PaperMC/Paper@fe2f3d4 Fix portal exit resulting in bad teleport transition
PaperMC/Paper@9f1fa0b Fix item gravity on inactive items, remove dumb active skipping
PaperMC/Paper@1a1d0cf Use target pitch in teleport (generally the same thing)
PaperMC/Paper@8ba3073 fix "is_freezing" damage type tag
PaperMC/Paper@1523212 don't resend effects when PlayerItemConsumeEvent is cancelled
PaperMC/Paper@1330880 Add Friction API to minecarts
PaperMC/Paper@580a610 Allow using old ender pearl behavior & apply ender pearl exploit patch (#11524)
PaperMC/Paper@40a960d Rebuild patches

patches/server/0020-Optimise-cannon-entity-movement.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Optimise cannon entity movement
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a636c0331b6c963224727eaaed9c09d29ba9d2d7..ccbe81eb8df2406554c34e771b16855136db111c 100644
+index c8b33f6d5b820da4b9e16b7d251ca4aad1875aa8..fcb0df76474b641ea86eeb87755faead66397d26 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1166,6 +1166,93 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -1249,6 +1249,75 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          return this.moveStartZ;
      }
      // Paper end - detailed watchdog information
@@ -18,31 +18,28 @@ index a636c0331b6c963224727eaaed9c09d29ba9d2d7..ccbe81eb8df2406554c34e771b168551
 +        if (this.noPhysics) {
 +            this.setPos(this.getX() + movement.x, this.getY() + movement.y, this.getZ() + movement.z);
 +        } else {
-+            if (movementType == MoverType.PISTON) {  // Paper
++            if (movementType == MoverType.PISTON) {
 +                movement = this.limitPistonMovement(movement);
 +                if (movement.equals(Vec3.ZERO)) {
 +                    return;
 +                }
 +            }
 +
-+            this.level().getProfiler().push("move");
++            ProfilerFiller gameprofilerfiller = Profiler.get();
++            gameprofilerfiller.push("move");
 +            if (this.stuckSpeedMultiplier.lengthSqr() > 1.0E-7D) {
 +                movement = movement.multiply(this.stuckSpeedMultiplier);
 +                this.stuckSpeedMultiplier = Vec3.ZERO;
 +                this.setDeltaMovement(Vec3.ZERO);
 +            }
 +
-+            // collideScan for optimised large movements
 +            Vec3 vec3d1 = this.sakura_collide(movement);
 +            double d0 = vec3d1.lengthSqr();
 +
-+            if (d0 > 1.0E-7D) {
-+                // NOTE: Every minecraft update check if there are any new blocks that make sure of fallDistance.
-+                // As of 1.21 the only block is powdered snow which returns a solid collision for falling blocks.
++            if (d0 > 1.0E-7D || movement.lengthSqr() - d0 < 1.0E-7D) {
 +                if (this.fallDistance != 0.0F && d0 >= 1.0D && !this.isFallingBlock) {
-+                    BlockHitResult movingobjectpositionblock = this.level().clip(new ClipContext(this.position(), this.position().add(vec3d1), ClipContext.Block.FALLDAMAGE_RESETTING, ClipContext.Fluid.WATER, this));
-+
-+                    if (movingobjectpositionblock.getType() != HitResult.Type.MISS) {
++                    BlockHitResult clipResult = this.level().clip(new ClipContext(this.position(), this.position().add(vec3d1), ClipContext.Block.FALLDAMAGE_RESETTING, ClipContext.Fluid.WATER, this));
++                    if (clipResult.getType() != HitResult.Type.MISS) {
 +                        this.resetFallDistance();
 +                    }
 +                }
@@ -50,59 +47,44 @@ index a636c0331b6c963224727eaaed9c09d29ba9d2d7..ccbe81eb8df2406554c34e771b168551
 +                this.setPos(this.getX() + vec3d1.x, this.getY() + vec3d1.y, this.getZ() + vec3d1.z);
 +            }
 +
-+            this.level().getProfiler().pop();
-+            this.level().getProfiler().push("rest");
-+            boolean flag = !Mth.equal(movement.x, vec3d1.x);
-+            boolean flag1 = !Mth.equal(movement.z, vec3d1.z);
++            gameprofilerfiller.pop();
++            gameprofilerfiller.push("rest");
++            boolean movedX = !Mth.equal(movement.x, vec3d1.x);
++            boolean movedZ = !Mth.equal(movement.z, vec3d1.z);
 +
-+            this.horizontalCollision = flag || flag1;
++            this.horizontalCollision = movedX || movedZ;
 +            this.verticalCollision = movement.y != vec3d1.y;
 +            this.verticalCollisionBelow = this.verticalCollision && movement.y < 0.0D;
-+            if (this.horizontalCollision) {
-+                this.minorHorizontalCollision = this.isHorizontalCollisionMinor(vec3d1);
-+            } else {
-+                this.minorHorizontalCollision = false;
-+            }
 +
-+            this.setOnGroundWithMovement(this.verticalCollisionBelow, vec3d1);
-+            BlockPos blockposition = this.getOnPosLegacy();
-+            BlockState iblockdata = this.level().getBlockState(blockposition);
++            this.setOnGroundWithMovement(this.verticalCollisionBelow, this.horizontalCollision, vec3d1);
++            BlockPos blockPosBelow = this.getOnPosLegacy();
++            BlockState blockstate = this.level().getBlockState(blockPosBelow);
 +
-+            this.checkFallDamage(vec3d1.y, this.onGround(), iblockdata, blockposition);
++            this.checkFallDamage(vec3d1.y, this.onGround(), blockstate, blockPosBelow);
 +            if (this.isRemoved()) {
-+                this.level().getProfiler().pop();
++                gameprofilerfiller.pop();
 +            } else {
 +                if (this.horizontalCollision) {
 +                    Vec3 vec3d2 = this.getDeltaMovement();
-+
-+                    this.setDeltaMovement(flag ? 0.0D : vec3d2.x, vec3d2.y, flag1 ? 0.0D : vec3d2.z);
++                    this.setDeltaMovement(movedX ? 0.0D : vec3d2.x, vec3d2.y, movedZ ? 0.0D : vec3d2.z);
 +                }
 +
-+                Block block = iblockdata.getBlock();
-+
-+                if (movement.y != vec3d1.y) {
-+                    block.updateEntityAfterFallOn(this.level(), this);
++                Block block = blockstate.getBlock();
++                if (movement.y != vec3d1.y) { // remove y momentum
++                    block.updateEntityMovementAfterFallOn(this.level(), this);
 +                }
 +
-+                if (this.onGround()) {
-+                    // used for slowing down entities on top of slime
-+                    block.stepOn(this.level(), blockposition, iblockdata, this);
-+                }
-+
-+                this.tryCheckInsideBlocks();
-+
 +                float f = this.getBlockSpeedFactor();
-+
 +                this.setDeltaMovement(this.getDeltaMovement().multiply((double) f, 1.0D, (double) f));
-+                this.level().getProfiler().pop();
++                gameprofilerfiller.pop();
 +            }
 +        }
 +    }
 +    // Sakura end -  optimise cannon entity movement; stripped back movement method
  
-     public void move(MoverType movementType, Vec3 movement) {
+     public void move(MoverType type, Vec3 movement) {
          final Vec3 originalMovement = movement; // Paper - Expose pre-collision velocity
-@@ -1510,6 +1597,104 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -1610,6 +1679,107 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          return offsetFactor;
      }
  
@@ -175,10 +157,13 @@ index a636c0331b6c963224727eaaed9c09d29ba9d2d7..ccbe81eb8df2406554c34e771b168551
 +
 +    private void collectCollisions(AABB collisionBox, List<VoxelShape> voxelList, List<AABB> bbList) {
 +        // Copied from the collide method below
-+        ca.spottedleaf.moonrise.patches.collisions.CollisionUtil.getCollisions(
++        ca.spottedleaf.moonrise.patches.collisions.CollisionUtil.getCollisionsForBlocksOrWorldBorder(
 +            this.level, this, collisionBox, voxelList, bbList,
-+            ca.spottedleaf.moonrise.patches.collisions.CollisionUtil.COLLISION_FLAG_CHECK_BORDER | this.getExtraCollisionFlags(), // Sakura - load chunks on movement
-+            null, null
++            ca.spottedleaf.moonrise.patches.collisions.CollisionUtil.COLLISION_FLAG_CHECK_BORDER  | this.getExtraCollisionFlags(), null // Sakura - load chunks on movement
++        );
++
++        ca.spottedleaf.moonrise.patches.collisions.CollisionUtil.getEntityHardCollisions(
++            this.level, this, collisionBox, bbList, 0, null
 +        );
 +    }
 +
@@ -208,28 +193,28 @@ index a636c0331b6c963224727eaaed9c09d29ba9d2d7..ccbe81eb8df2406554c34e771b168551
          // Paper start - optimise collisions
          final boolean xZero = movement.x == 0.0;
 diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-index 53488a1d0c56e7da4cf93c08cab01a033fb4f1f8..d1e06ef173468fa722d4b121e44ac0a9a314ee78 100644
+index f0617e9d71fa47dfc0566f31d85b8a05ba3b16fc..32811e9d925911864e0c0fa5a2e25031098f423e 100644
 --- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-@@ -204,7 +204,7 @@ public class FallingBlockEntity extends Entity implements me.samsuik.sakura.enti
+@@ -213,7 +213,7 @@ public class FallingBlockEntity extends Entity implements me.samsuik.sakura.enti
  
              ++this.time;
              this.applyGravity();
 -            this.move(MoverType.SELF, this.getDeltaMovement());
 +            this.moveStripped(MoverType.SELF, this.getDeltaMovement()); // Sakura - optimise cannon entity movement
+             this.applyEffectsFromBlocks();
              // Paper start - Configurable falling blocks height nerf
              if (this.level().paperConfig().fixes.fallingBlockHeightNerf.test(v -> this.getY() > v)) {
-                 if (this.dropItem && this.level().getGameRules().getBoolean(GameRules.RULE_DOENTITYDROPS)) {
 diff --git a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-index e64c85bf8fbd3ad0d7e8a6e4a34aed8140f4f8bc..1a2cdd2235dfa930e82151a370ddf2e60f2866fa 100644
+index 0a9e62dd90c6aba4ff97391d69f9a92d9555cae6..7bb55565208b99db095c5842a7e21fd21700173e 100644
 --- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 +++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-@@ -124,7 +124,7 @@ public class PrimedTnt extends Entity implements TraceableEntity, me.samsuik.sak
+@@ -130,7 +130,7 @@ public class PrimedTnt extends Entity implements TraceableEntity, me.samsuik.sak
          if (this.level().spigotConfig.maxTntTicksPerTick > 0 && ++this.level().spigotConfig.currentPrimedTnt > this.level().spigotConfig.maxTntTicksPerTick) { return; } // Spigot
          this.handlePortal();
          this.applyGravity();
 -        this.move(MoverType.SELF, this.getDeltaMovement());
 +        this.moveStripped(MoverType.SELF, this.getDeltaMovement()); // Sakura - optimise cannon entity movement
+         this.applyEffectsFromBlocks();
          // Paper start - Configurable TNT height nerf
          if (this.level().paperConfig().fixes.tntEntityHeightNerf.test(v -> this.getY() > v)) {
-             this.discard(EntityRemoveEvent.Cause.OUT_OF_WORLD);