diff --git a/patches/server/0113-Optimize-nearby-alive-players-for-spawning.patch b/patches/server/0112-Optimize-nearby-alive-players-for-spawning.patch
similarity index 100%
rename from patches/server/0113-Optimize-nearby-alive-players-for-spawning.patch
rename to patches/server/0112-Optimize-nearby-alive-players-for-spawning.patch
diff --git a/patches/server/0114-Cache-blockstate-cache.patch b/patches/server/0113-Cache-blockstate-cache.patch
similarity index 89%
rename from patches/server/0114-Cache-blockstate-cache.patch
rename to patches/server/0113-Cache-blockstate-cache.patch
index 641d2413..84d7d29d 100644
--- a/patches/server/0114-Cache-blockstate-cache.patch
+++ b/patches/server/0113-Cache-blockstate-cache.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Cache blockstate cache
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
-index ca2b57d13128717ebb772dd6523d2909f12560cd..cabb4b79248725ea8f831d5f1b27902c3c9ea262 100644
+index 9b94d8bf3415734776c81297d5d34eea46ad7e78..65d8ac795282117ba88003e7a703ee649a359473 100644
 --- a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
 +++ b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
-@@ -1446,6 +1446,10 @@ public abstract class BlockBehaviour implements FeatureElement {
+@@ -1438,6 +1438,10 @@ public abstract class BlockBehaviour implements FeatureElement {
  
              private static final Direction[] DIRECTIONS = Direction.values();
              private static final int SUPPORT_TYPE_COUNT = SupportType.values().length;
@@ -19,7 +19,7 @@ index ca2b57d13128717ebb772dd6523d2909f12560cd..cabb4b79248725ea8f831d5f1b27902c
              protected final VoxelShape collisionShape;
              protected boolean largeCollisionShape; // Leaf - not final
              private final boolean[] faceSturdy;
-@@ -1459,7 +1463,7 @@ public abstract class BlockBehaviour implements FeatureElement {
+@@ -1451,7 +1455,7 @@ public abstract class BlockBehaviour implements FeatureElement {
                      throw new IllegalStateException(String.format(Locale.ROOT, "%s has a collision shape and an offset type, but is not marked as dynamicShape in its properties.", BuiltInRegistries.BLOCK.getKey(block)));
                  } else {
                      // Leaf start - Remove stream
@@ -28,7 +28,7 @@ index ca2b57d13128717ebb772dd6523d2909f12560cd..cabb4b79248725ea8f831d5f1b27902c
                          if (this.collisionShape.min(axis) < 0.0D || this.collisionShape.max(axis) > 1.0D) {
                              this.largeCollisionShape = true;
                              break;
-@@ -1472,7 +1476,7 @@ public abstract class BlockBehaviour implements FeatureElement {
+@@ -1464,7 +1468,7 @@ public abstract class BlockBehaviour implements FeatureElement {
  
                      for (int j = 0; j < i; ++j) {
                          Direction enumdirection = aenumdirection[j];
diff --git a/patches/server/0115-Asynchronous-locator.patch b/patches/server/0114-Asynchronous-locator.patch
similarity index 100%
rename from patches/server/0115-Asynchronous-locator.patch
rename to patches/server/0114-Asynchronous-locator.patch
diff --git a/patches/server/0116-Smart-sort-entities-in-NearestLivingEntitySensor.patch b/patches/server/0115-Smart-sort-entities-in-NearestLivingEntitySensor.patch
similarity index 100%
rename from patches/server/0116-Smart-sort-entities-in-NearestLivingEntitySensor.patch
rename to patches/server/0115-Smart-sort-entities-in-NearestLivingEntitySensor.patch
diff --git a/patches/server/0117-Further-reduce-memory-footprint-of-CompoundTag.patch b/patches/server/0116-Further-reduce-memory-footprint-of-CompoundTag.patch
similarity index 100%
rename from patches/server/0117-Further-reduce-memory-footprint-of-CompoundTag.patch
rename to patches/server/0116-Further-reduce-memory-footprint-of-CompoundTag.patch
diff --git a/patches/server/0118-Optimize-Entity-distanceToSqr.patch b/patches/server/0117-Optimize-Entity-distanceToSqr.patch
similarity index 100%
rename from patches/server/0118-Optimize-Entity-distanceToSqr.patch
rename to patches/server/0117-Optimize-Entity-distanceToSqr.patch
diff --git a/patches/server/0119-EMC-Don-t-use-snapshots-for-TileEntity-getOwner.patch b/patches/server/0118-EMC-Don-t-use-snapshots-for-TileEntity-getOwner.patch
similarity index 100%
rename from patches/server/0119-EMC-Don-t-use-snapshots-for-TileEntity-getOwner.patch
rename to patches/server/0118-EMC-Don-t-use-snapshots-for-TileEntity-getOwner.patch
diff --git a/patches/server/0120-EMC-Default-don-t-use-blockstate-snapshots.patch b/patches/server/0119-EMC-Default-don-t-use-blockstate-snapshots.patch
similarity index 100%
rename from patches/server/0120-EMC-Default-don-t-use-blockstate-snapshots.patch
rename to patches/server/0119-EMC-Default-don-t-use-blockstate-snapshots.patch
diff --git a/patches/server/0121-Cache-tile-entity-position.patch b/patches/server/0120-Cache-tile-entity-position.patch
similarity index 96%
rename from patches/server/0121-Cache-tile-entity-position.patch
rename to patches/server/0120-Cache-tile-entity-position.patch
index c67314a8..8d2186f9 100644
--- a/patches/server/0121-Cache-tile-entity-position.patch
+++ b/patches/server/0120-Cache-tile-entity-position.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Cache tile entity position
 Check if there is a way to cache isRemoved without problem
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 06a969587f25748d4e29036e1b73ab8ff27fe12f..2d4650b8c6b2d51df7eb70b08b9a12caee6458a5 100644
+index b8246d7255bffc7e12a67772df2ceac1925b2a05..2ac51b5ed6fe50746f4f64f94e289f5ad75fd715 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -1038,13 +1038,16 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
diff --git a/patches/server/0122-TT20-Lag-compensation.patch b/patches/server/0121-TT20-Lag-compensation.patch
similarity index 100%
rename from patches/server/0122-TT20-Lag-compensation.patch
rename to patches/server/0121-TT20-Lag-compensation.patch
diff --git a/patches/server/0123-C2ME-Reduce-Allocations.patch b/patches/server/0122-C2ME-Reduce-Allocations.patch
similarity index 100%
rename from patches/server/0123-C2ME-Reduce-Allocations.patch
rename to patches/server/0122-C2ME-Reduce-Allocations.patch
diff --git a/patches/server/0124-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch b/patches/server/0123-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch
similarity index 100%
rename from patches/server/0124-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch
rename to patches/server/0123-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch
diff --git a/patches/server/0125-Lithium-fast-util.patch b/patches/server/0124-Lithium-fast-util.patch
similarity index 100%
rename from patches/server/0125-Lithium-fast-util.patch
rename to patches/server/0124-Lithium-fast-util.patch
diff --git a/patches/server/0126-Lithium-CompactSineLUT.patch b/patches/server/0125-Lithium-CompactSineLUT.patch
similarity index 100%
rename from patches/server/0126-Lithium-CompactSineLUT.patch
rename to patches/server/0125-Lithium-CompactSineLUT.patch
diff --git a/patches/server/0127-Lithium-IterateOutwardsCache.patch b/patches/server/0126-Lithium-IterateOutwardsCache.patch
similarity index 100%
rename from patches/server/0127-Lithium-IterateOutwardsCache.patch
rename to patches/server/0126-Lithium-IterateOutwardsCache.patch
diff --git a/patches/server/0128-Lithium-HashedList.patch b/patches/server/0127-Lithium-HashedList.patch
similarity index 100%
rename from patches/server/0128-Lithium-HashedList.patch
rename to patches/server/0127-Lithium-HashedList.patch
diff --git a/patches/server/0129-Smooth-teleport-config.patch b/patches/server/0128-Smooth-teleport-config.patch
similarity index 100%
rename from patches/server/0129-Smooth-teleport-config.patch
rename to patches/server/0128-Smooth-teleport-config.patch
diff --git a/patches/server/0130-Use-faster-and-thread-safe-ban-list-date-format-pars.patch b/patches/server/0129-Use-faster-and-thread-safe-ban-list-date-format-pars.patch
similarity index 100%
rename from patches/server/0130-Use-faster-and-thread-safe-ban-list-date-format-pars.patch
rename to patches/server/0129-Use-faster-and-thread-safe-ban-list-date-format-pars.patch
diff --git a/patches/server/0131-Collect-then-startEachNonRunningBehavior-in-Brain.patch b/patches/server/0130-Collect-then-startEachNonRunningBehavior-in-Brain.patch
similarity index 100%
rename from patches/server/0131-Collect-then-startEachNonRunningBehavior-in-Brain.patch
rename to patches/server/0130-Collect-then-startEachNonRunningBehavior-in-Brain.patch
diff --git a/patches/server/0132-Lithium-equipment-tracking.patch b/patches/server/0131-Lithium-equipment-tracking.patch
similarity index 100%
rename from patches/server/0132-Lithium-equipment-tracking.patch
rename to patches/server/0131-Lithium-equipment-tracking.patch
diff --git a/patches/server/0133-Faster-CraftServer-getworlds-list-creation.patch b/patches/server/0132-Faster-CraftServer-getworlds-list-creation.patch
similarity index 100%
rename from patches/server/0133-Faster-CraftServer-getworlds-list-creation.patch
rename to patches/server/0132-Faster-CraftServer-getworlds-list-creation.patch
diff --git a/patches/server/0134-C2ME-Optimize-world-gen-math.patch b/patches/server/0133-C2ME-Optimize-world-gen-math.patch
similarity index 100%
rename from patches/server/0134-C2ME-Optimize-world-gen-math.patch
rename to patches/server/0133-C2ME-Optimize-world-gen-math.patch
diff --git a/patches/server/0135-Cache-chunk-key.patch b/patches/server/0134-Cache-chunk-key.patch
similarity index 100%
rename from patches/server/0135-Cache-chunk-key.patch
rename to patches/server/0134-Cache-chunk-key.patch
diff --git a/patches/server/0136-Cache-random-tick-block-status.patch b/patches/server/0135-Cache-random-tick-block-status.patch
similarity index 100%
rename from patches/server/0136-Cache-random-tick-block-status.patch
rename to patches/server/0135-Cache-random-tick-block-status.patch
diff --git a/patches/server/0137-Cache-canHoldAnyFluid-result.patch b/patches/server/0136-Cache-canHoldAnyFluid-result.patch
similarity index 93%
rename from patches/server/0137-Cache-canHoldAnyFluid-result.patch
rename to patches/server/0136-Cache-canHoldAnyFluid-result.patch
index e889ebcc..f4545e76 100644
--- a/patches/server/0137-Cache-canHoldAnyFluid-result.patch
+++ b/patches/server/0136-Cache-canHoldAnyFluid-result.patch
@@ -10,10 +10,10 @@ which the contains iteration call is very expensive if called everytime
 In the test, it can improve ~30% performance in ~1577000 times of canHoldAnyFluid calls (~159ms -> ~111ms)
 
 diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
-index cabb4b79248725ea8f831d5f1b27902c3c9ea262..d371c3846917a7cea17cd38510d366535c2b6954 100644
+index 65d8ac795282117ba88003e7a703ee649a359473..b0df5ac8efdca17498f7f87bb86e376122aa6fe3 100644
 --- a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
 +++ b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
-@@ -844,6 +844,8 @@ public abstract class BlockBehaviour implements FeatureElement {
+@@ -836,6 +836,8 @@ public abstract class BlockBehaviour implements FeatureElement {
          private VoxelShape[] occlusionShapesByFace;
          private boolean propagatesSkylightDown;
          private int lightBlock;
@@ -22,7 +22,7 @@ index cabb4b79248725ea8f831d5f1b27902c3c9ea262..d371c3846917a7cea17cd38510d36653
  
          // Paper start - rewrite chunk system
          private boolean isConditionallyFullOpaque;
-@@ -999,6 +1001,8 @@ public abstract class BlockBehaviour implements FeatureElement {
+@@ -991,6 +993,8 @@ public abstract class BlockBehaviour implements FeatureElement {
  
              this.propagatesSkylightDown = ((Block) this.owner).propagatesSkylightDown(this.asState());
              this.lightBlock = ((Block) this.owner).getLightBlock(this.asState());
@@ -31,7 +31,7 @@ index cabb4b79248725ea8f831d5f1b27902c3c9ea262..d371c3846917a7cea17cd38510d36653
              // Paper start - rewrite chunk system
              this.isConditionallyFullOpaque = this.canOcclude & this.useShapeForLightOcclusion;
              // Paper end - rewrite chunk system
-@@ -1058,6 +1062,18 @@ public abstract class BlockBehaviour implements FeatureElement {
+@@ -1050,6 +1054,18 @@ public abstract class BlockBehaviour implements FeatureElement {
              return this.legacySolid;
          }
  
diff --git a/patches/server/0138-Configurable-tripwire-dupe.patch b/patches/server/0137-Configurable-tripwire-dupe.patch
similarity index 100%
rename from patches/server/0138-Configurable-tripwire-dupe.patch
rename to patches/server/0137-Configurable-tripwire-dupe.patch
diff --git a/patches/server/0112-Reduce-object-complexity-to-make-block-isValid-calls.patch b/patches/work/server/0112-Reduce-object-complexity-to-make-block-isValid-calls.patch
similarity index 100%
rename from patches/server/0112-Reduce-object-complexity-to-make-block-isValid-calls.patch
rename to patches/work/server/0112-Reduce-object-complexity-to-make-block-isValid-calls.patch