diff --git a/versions/snapshot/1.21/24w45a/patches/client/net/minecraft/client/Minecraft.java.patch b/versions/snapshot/1.21/24w45a/patches/client/net/minecraft/client/Minecraft.java.patch
index 38ace477..c2a4eec3 100644
--- a/versions/snapshot/1.21/24w45a/patches/client/net/minecraft/client/Minecraft.java.patch
+++ b/versions/snapshot/1.21/24w45a/patches/client/net/minecraft/client/Minecraft.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/Minecraft.java
 +++ b/net/minecraft/client/Minecraft.java
-@@ -2210,6 +2210,7 @@
+@@ -2201,6 +2201,7 @@
                  case EntityHitResult entityhitresult:
                      this.gameMode.handlePickItemFromEntity(entityhitresult.getEntity(), flag);
                      break;
@@ -8,7 +8,7 @@
              }
          }
      }
-@@ -2304,7 +2305,7 @@
+@@ -2295,7 +2296,7 @@
      }
  
      public CompletableFuture<Void> delayTextureReload() {
diff --git a/versions/snapshot/1.21/24w45a/patches/client/net/minecraft/client/data/Main.java.patch b/versions/snapshot/1.21/24w45a/patches/client/net/minecraft/client/data/Main.java.patch
new file mode 100644
index 00000000..6c1df83a
--- /dev/null
+++ b/versions/snapshot/1.21/24w45a/patches/client/net/minecraft/client/data/Main.java.patch
@@ -0,0 +1,11 @@
+--- a/net/minecraft/client/data/Main.java
++++ b/net/minecraft/client/data/Main.java
+@@ -18,7 +18,7 @@
+ public class Main {
+     @DontObfuscate
+     @SuppressForbidden(
+-        a = "System.out needed before bootstrap"
++        reason = "System.out needed before bootstrap"
+     )
+     public static void main(String[] p_388033_) throws IOException {
+         SharedConstants.tryDetectVersion();
diff --git a/versions/snapshot/1.21/24w45a/patches/client/net/minecraft/client/renderer/block/model/multipart/MultiPart.java.patch b/versions/snapshot/1.21/24w45a/patches/client/net/minecraft/client/renderer/block/model/multipart/MultiPart.java.patch
index e6a8a69c..178a7cb9 100644
--- a/versions/snapshot/1.21/24w45a/patches/client/net/minecraft/client/renderer/block/model/multipart/MultiPart.java.patch
+++ b/versions/snapshot/1.21/24w45a/patches/client/net/minecraft/client/renderer/block/model/multipart/MultiPart.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/renderer/block/model/multipart/MultiPart.java
 +++ b/net/minecraft/client/renderer/block/model/multipart/MultiPart.java
-@@ -45,17 +45,9 @@
+@@ -41,17 +41,9 @@
              }
          }
  
diff --git a/versions/snapshot/1.21/24w45a/patches/client/net/minecraft/client/resources/model/BlockStateModelLoader.java.patch b/versions/snapshot/1.21/24w45a/patches/client/net/minecraft/client/resources/model/BlockStateModelLoader.java.patch
deleted file mode 100644
index 47f73d86..00000000
--- a/versions/snapshot/1.21/24w45a/patches/client/net/minecraft/client/resources/model/BlockStateModelLoader.java.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/net/minecraft/client/resources/model/BlockStateModelLoader.java
-+++ b/net/minecraft/client/resources/model/BlockStateModelLoader.java
-@@ -69,7 +69,7 @@
- 
-             while (true) {
-                 if (!iterator.hasNext()) {
--                    ;
-+                    break;
-                 } else {
-                     BlockState blockstate = (BlockState)iterator.next();
-                     ModelResourceLocation modelresourcelocation = BlockModelShaper.stateToModelLocation(p_362931_, blockstate);
diff --git a/versions/snapshot/1.21/24w45a/patches/joined/net/minecraft/client/Minecraft.java.patch b/versions/snapshot/1.21/24w45a/patches/joined/net/minecraft/client/Minecraft.java.patch
index a1f26fd7..f1317b7a 100644
--- a/versions/snapshot/1.21/24w45a/patches/joined/net/minecraft/client/Minecraft.java.patch
+++ b/versions/snapshot/1.21/24w45a/patches/joined/net/minecraft/client/Minecraft.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/Minecraft.java
 +++ b/net/minecraft/client/Minecraft.java
-@@ -2213,6 +2213,7 @@
+@@ -2204,6 +2204,7 @@
                  case EntityHitResult entityhitresult:
                      this.gameMode.handlePickItemFromEntity(entityhitresult.getEntity(), flag);
                      break;
@@ -8,7 +8,7 @@
              }
          }
      }
-@@ -2307,7 +2308,7 @@
+@@ -2298,7 +2299,7 @@
      }
  
      public CompletableFuture<Void> delayTextureReload() {
diff --git a/versions/snapshot/1.21/24w45a/patches/joined/net/minecraft/client/data/Main.java.patch b/versions/snapshot/1.21/24w45a/patches/joined/net/minecraft/client/data/Main.java.patch
new file mode 100644
index 00000000..ff249e1f
--- /dev/null
+++ b/versions/snapshot/1.21/24w45a/patches/joined/net/minecraft/client/data/Main.java.patch
@@ -0,0 +1,11 @@
+--- a/net/minecraft/client/data/Main.java
++++ b/net/minecraft/client/data/Main.java
+@@ -21,7 +21,7 @@
+ public class Main {
+     @DontObfuscate
+     @SuppressForbidden(
+-        a = "System.out needed before bootstrap"
++        reason = "System.out needed before bootstrap"
+     )
+     public static void main(String[] p_388033_) throws IOException {
+         SharedConstants.tryDetectVersion();
diff --git a/versions/snapshot/1.21/24w45a/patches/joined/net/minecraft/client/renderer/block/model/multipart/MultiPart.java.patch b/versions/snapshot/1.21/24w45a/patches/joined/net/minecraft/client/renderer/block/model/multipart/MultiPart.java.patch
index 5459f8d0..d7729ba2 100644
--- a/versions/snapshot/1.21/24w45a/patches/joined/net/minecraft/client/renderer/block/model/multipart/MultiPart.java.patch
+++ b/versions/snapshot/1.21/24w45a/patches/joined/net/minecraft/client/renderer/block/model/multipart/MultiPart.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/renderer/block/model/multipart/MultiPart.java
 +++ b/net/minecraft/client/renderer/block/model/multipart/MultiPart.java
-@@ -49,17 +49,9 @@
+@@ -45,17 +45,9 @@
          }
  
          @OnlyIn(Dist.CLIENT)
diff --git a/versions/snapshot/1.21/24w45a/patches/joined/net/minecraft/client/resources/model/BlockStateModelLoader.java.patch b/versions/snapshot/1.21/24w45a/patches/joined/net/minecraft/client/resources/model/BlockStateModelLoader.java.patch
deleted file mode 100644
index 763b97e3..00000000
--- a/versions/snapshot/1.21/24w45a/patches/joined/net/minecraft/client/resources/model/BlockStateModelLoader.java.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/net/minecraft/client/resources/model/BlockStateModelLoader.java
-+++ b/net/minecraft/client/resources/model/BlockStateModelLoader.java
-@@ -72,7 +72,7 @@
- 
-             while (true) {
-                 if (!iterator.hasNext()) {
--                    ;
-+                    break;
-                 } else {
-                     BlockState blockstate = (BlockState)iterator.next();
-                     ModelResourceLocation modelresourcelocation = BlockModelShaper.stateToModelLocation(p_362931_, blockstate);
diff --git a/versions/snapshot/1.21/24w45a/patches/shared/net/minecraft/data/Main.java.patch b/versions/snapshot/1.21/24w45a/patches/shared/net/minecraft/data/Main.java.patch
new file mode 100644
index 00000000..525774de
--- /dev/null
+++ b/versions/snapshot/1.21/24w45a/patches/shared/net/minecraft/data/Main.java.patch
@@ -0,0 +1,11 @@
+--- a/net/minecraft/data/Main.java
++++ b/net/minecraft/data/Main.java
+@@ -63,7 +63,7 @@
+ 
+ public class Main {
+     @SuppressForbidden(
+-        a = "System.out needed before bootstrap"
++        reason = "System.out needed before bootstrap"
+     )
+     @DontObfuscate
+     public static void main(String[] p_129669_) throws IOException {
diff --git a/versions/snapshot/1.21/24w45a/patches/shared/net/minecraft/resources/HolderSetCodec.java.patch b/versions/snapshot/1.21/24w45a/patches/shared/net/minecraft/resources/HolderSetCodec.java.patch
index 93d99808..dfeff5a2 100644
--- a/versions/snapshot/1.21/24w45a/patches/shared/net/minecraft/resources/HolderSetCodec.java.patch
+++ b/versions/snapshot/1.21/24w45a/patches/shared/net/minecraft/resources/HolderSetCodec.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/resources/HolderSetCodec.java
 +++ b/net/minecraft/resources/HolderSetCodec.java
-@@ -70,7 +70,7 @@
+@@ -64,7 +64,7 @@
  
      private static <E> DataResult<HolderSet<E>> lookupTag(HolderGetter<E> p_332757_, TagKey<E> p_332743_) {
          return p_332757_.get(p_332743_)
diff --git a/versions/snapshot/1.21/24w45a/patches/shared/net/minecraft/server/Bootstrap.java.patch b/versions/snapshot/1.21/24w45a/patches/shared/net/minecraft/server/Bootstrap.java.patch
new file mode 100644
index 00000000..9e89ce4e
--- /dev/null
+++ b/versions/snapshot/1.21/24w45a/patches/shared/net/minecraft/server/Bootstrap.java.patch
@@ -0,0 +1,11 @@
+--- a/net/minecraft/server/Bootstrap.java
++++ b/net/minecraft/server/Bootstrap.java
+@@ -32,7 +32,7 @@
+ import org.slf4j.Logger;
+ 
+ @SuppressForbidden(
+-    a = "System.out setup"
++    reason = "System.out setup"
+ )
+ public class Bootstrap {
+     public static final PrintStream STDOUT = System.out;
diff --git a/versions/snapshot/1.21/24w45a/patches/shared/net/minecraft/server/Main.java.patch b/versions/snapshot/1.21/24w45a/patches/shared/net/minecraft/server/Main.java.patch
new file mode 100644
index 00000000..1a74cc9d
--- /dev/null
+++ b/versions/snapshot/1.21/24w45a/patches/shared/net/minecraft/server/Main.java.patch
@@ -0,0 +1,11 @@
+--- a/net/minecraft/server/Main.java
++++ b/net/minecraft/server/Main.java
+@@ -65,7 +65,7 @@
+     private static final Logger LOGGER = LogUtils.getLogger();
+ 
+     @SuppressForbidden(
+-        a = "System.out needed before bootstrap"
++        reason = "System.out needed before bootstrap"
+     )
+     @DontObfuscate
+     public static void main(String[] p_129699_) {
diff --git a/versions/snapshot/1.21/24w45a/patches/shared/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch b/versions/snapshot/1.21/24w45a/patches/shared/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch
index 65db5bfd..23c48c63 100644
--- a/versions/snapshot/1.21/24w45a/patches/shared/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch
+++ b/versions/snapshot/1.21/24w45a/patches/shared/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -424,6 +424,7 @@
+@@ -425,6 +425,7 @@
                  }
  
                  entity.move(MoverType.PLAYER, new Vec3(d6, d7, d8));
@@ -8,16 +8,16 @@
                  d6 = d3 - entity.getX();
                  d7 = d4 - entity.getY();
                  if (d7 > -0.5 || d7 < 0.5) {
-@@ -451,7 +452,7 @@
-                 Vec3 vec3 = new Vec3(entity.getX() - d0, entity.getY() - d1, entity.getZ() - d2);
+@@ -453,7 +454,7 @@
                  this.handlePlayerKnownMovement(vec3);
+                 entity.setOnGroundWithMovement(p_9876_.onGround(), vec3);
                  this.player.checkMovementStatistics(vec3.x, vec3.y, vec3.z);
 -                this.clientVehicleIsFloating = d7 >= -0.03125
 +                this.clientVehicleIsFloating = d11 >= -0.03125
                      && !flag1
                      && !this.server.isFlightAllowed()
                      && !entity.isNoGravity()
-@@ -844,7 +845,7 @@
+@@ -850,7 +851,7 @@
          if (itemstack.has(DataComponents.WRITABLE_BOOK_CONTENT)) {
              ItemStack itemstack1 = itemstack.transmuteCopy(Items.WRITTEN_BOOK);
              itemstack1.remove(DataComponents.WRITABLE_BOOK_CONTENT);
diff --git a/versions/snapshot/1.21/24w45a/patches/shared/net/minecraft/util/ExtraCodecs.java.patch b/versions/snapshot/1.21/24w45a/patches/shared/net/minecraft/util/ExtraCodecs.java.patch
index 8a7d6d88..7debd8b0 100644
--- a/versions/snapshot/1.21/24w45a/patches/shared/net/minecraft/util/ExtraCodecs.java.patch
+++ b/versions/snapshot/1.21/24w45a/patches/shared/net/minecraft/util/ExtraCodecs.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/util/ExtraCodecs.java
 +++ b/net/minecraft/util/ExtraCodecs.java
-@@ -232,7 +232,7 @@
+@@ -234,7 +234,7 @@
                  P p1 = p_184445_.get(1);
                  return p_184365_.apply(p, p1);
              }), p_184459_ -> ImmutableList.of(p_184366_.apply((I)p_184459_), p_184367_.apply((I)p_184459_)));
@@ -9,7 +9,7 @@
                  p_184360_ -> p_184360_.group(p_184362_.fieldOf(p_184363_).forGetter(Pair::getFirst), p_184362_.fieldOf(p_184364_).forGetter(Pair::getSecond))
                          .apply(p_184360_, Pair::of)
              )
-@@ -515,7 +515,7 @@
+@@ -545,7 +545,7 @@
              public <T> RecordBuilder<T> encode(V p_312741_, DynamicOps<T> p_312649_, RecordBuilder<T> p_312297_) {
                  K k = (K)p_312622_.apply(p_312741_);
                  p_312297_.add(p_312812_, p_312848_.encodeStart(p_312649_, k));
diff --git a/versions/snapshot/1.21/24w45a/patches/shared/net/minecraft/util/datafix/DataFixers.java.patch b/versions/snapshot/1.21/24w45a/patches/shared/net/minecraft/util/datafix/DataFixers.java.patch
index 2363c2f9..708a27a8 100644
--- a/versions/snapshot/1.21/24w45a/patches/shared/net/minecraft/util/datafix/DataFixers.java.patch
+++ b/versions/snapshot/1.21/24w45a/patches/shared/net/minecraft/util/datafix/DataFixers.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/util/datafix/DataFixers.java
 +++ b/net/minecraft/util/datafix/DataFixers.java
-@@ -1099,7 +1099,7 @@
+@@ -1103,7 +1103,7 @@
          Schema schema161 = p_14514_.addSchema(3086, SAME_NAMESPACED);
          p_14514_.addFixer(
              new EntityVariantFix(
@@ -9,7 +9,7 @@
                      p_216528_.defaultReturnValue("minecraft:tabby");
                      p_216528_.put(0, "minecraft:tabby");
                      p_216528_.put(1, "minecraft:black");
-@@ -1139,7 +1139,7 @@
+@@ -1143,7 +1143,7 @@
          Schema schema162 = p_14514_.addSchema(3087, SAME_NAMESPACED);
          p_14514_.addFixer(
              new EntityVariantFix(
diff --git a/versions/snapshot/1.21/24w45a/patches/shared/net/minecraft/world/entity/Entity.java.patch b/versions/snapshot/1.21/24w45a/patches/shared/net/minecraft/world/entity/Entity.java.patch
index 931116fe..531bac6f 100644
--- a/versions/snapshot/1.21/24w45a/patches/shared/net/minecraft/world/entity/Entity.java.patch
+++ b/versions/snapshot/1.21/24w45a/patches/shared/net/minecraft/world/entity/Entity.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
-@@ -488,7 +488,7 @@
+@@ -492,7 +492,7 @@
  
          this.firstTick = false;
          if (this.level() instanceof ServerLevel serverlevel1 && this instanceof Leashable) {
diff --git a/versions/snapshot/1.21/24w45a/patches/shared/net/minecraft/world/entity/animal/Sheep.java.patch b/versions/snapshot/1.21/24w45a/patches/shared/net/minecraft/world/entity/animal/Sheep.java.patch
index f46c2229..b9a47ae7 100644
--- a/versions/snapshot/1.21/24w45a/patches/shared/net/minecraft/world/entity/animal/Sheep.java.patch
+++ b/versions/snapshot/1.21/24w45a/patches/shared/net/minecraft/world/entity/animal/Sheep.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/entity/animal/Sheep.java
 +++ b/net/minecraft/world/entity/animal/Sheep.java
-@@ -58,7 +58,7 @@
+@@ -53,7 +53,7 @@
      private static final int EAT_ANIMATION_TICKS = 40;
      private static final EntityDataAccessor<Byte> DATA_WOOL_ID = SynchedEntityData.defineId(Sheep.class, EntityDataSerializers.BYTE);
      private static final Map<DyeColor, Integer> COLOR_BY_DYE = Maps.newEnumMap(
diff --git a/versions/snapshot/1.21/24w45a/patches/shared/net/minecraft/world/entity/monster/piglin/PiglinAi.java.patch b/versions/snapshot/1.21/24w45a/patches/shared/net/minecraft/world/entity/monster/piglin/PiglinAi.java.patch
index caae3618..c6df8b48 100644
--- a/versions/snapshot/1.21/24w45a/patches/shared/net/minecraft/world/entity/monster/piglin/PiglinAi.java.patch
+++ b/versions/snapshot/1.21/24w45a/patches/shared/net/minecraft/world/entity/monster/piglin/PiglinAi.java.patch
@@ -19,7 +19,7 @@
 +            ImmutableList.<net.minecraft.world.entity.ai.behavior.BehaviorControl<? super Piglin>>of(
                  avoidRepellent(),
                  SetEntityLookTarget.create(PiglinAi::isPlayerHoldingLovedItem, 14.0F),
-                 StartAttacking.<Piglin>create((p_381526_, p_381527_) -> p_381527_.isAdult(), PiglinAi::findNearestValidAttackTarget),
+                 StartAttacking.<Piglin>create((p_386321_, p_386322_) -> p_386322_.isAdult(), PiglinAi::findNearestValidAttackTarget),
 -                BehaviorBuilder.triggerIf(p_34804_ -> !p_34804_.isDancing(), GoToTargetLocation.create(MemoryModuleType.CELEBRATE_LOCATION, 2, 1.0F)),
 -                BehaviorBuilder.triggerIf(Piglin::isDancing, GoToTargetLocation.create(MemoryModuleType.CELEBRATE_LOCATION, 4, 0.6F)),
 -                new RunOne<LivingEntity>(
diff --git a/versions/snapshot/1.21/24w45a/patches/shared/net/minecraft/world/level/storage/loot/functions/SetCustomModelDataFunction.java.patch b/versions/snapshot/1.21/24w45a/patches/shared/net/minecraft/world/level/storage/loot/functions/SetCustomModelDataFunction.java.patch
new file mode 100644
index 00000000..d9cad1ad
--- /dev/null
+++ b/versions/snapshot/1.21/24w45a/patches/shared/net/minecraft/world/level/storage/loot/functions/SetCustomModelDataFunction.java.patch
@@ -0,0 +1,11 @@
+--- a/net/minecraft/world/level/storage/loot/functions/SetCustomModelDataFunction.java
++++ b/net/minecraft/world/level/storage/loot/functions/SetCustomModelDataFunction.java
+@@ -23,7 +23,7 @@
+ 
+ public class SetCustomModelDataFunction extends LootItemConditionalFunction {
+     private static final Codec<NumberProvider> COLOR_PROVIDER_CODEC = Codec.withAlternative(
+-        NumberProviders.CODEC, ExtraCodecs.RGB_COLOR_CODEC, ConstantValue::new
++        NumberProviders.CODEC, ExtraCodecs.RGB_COLOR_CODEC, integer -> new ConstantValue((float) integer)
+     );
+     public static final MapCodec<SetCustomModelDataFunction> CODEC = RecordCodecBuilder.mapCodec(
+         p_386432_ -> commonFields(p_386432_)