diff --git a/versions/24w03a/patches/net/minecraft/core/Registry.java.patch b/versions/24w03a/patches/net/minecraft/core/Registry.java.patch
index 18c6e8d..b13fff2 100644
--- a/versions/24w03a/patches/net/minecraft/core/Registry.java.patch
+++ b/versions/24w03a/patches/net/minecraft/core/Registry.java.patch
@@ -8,4 +8,4 @@
 +        return DataFixUtils.orElse(this.getTag(key), List.of());
      }
  
-     HolderSet.Named<T> getOrCreateTag(TagKey<T> key);
+     default Optional<Holder<T>> getRandomElementOf(TagKey<T> tagKey, RandomSource randomSource) {
diff --git a/versions/24w03a/patches/net/minecraft/network/ConnectionProtocol.java.patch b/versions/24w03a/patches/net/minecraft/network/ConnectionProtocol.java.patch
deleted file mode 100644
index 43885e2..0000000
--- a/versions/24w03a/patches/net/minecraft/network/ConnectionProtocol.java.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- a/net/minecraft/network/ConnectionProtocol.java
-+++ b/net/minecraft/network/ConnectionProtocol.java
-@@ -34,9 +_,11 @@
- import net.minecraft.network.protocol.common.ServerboundKeepAlivePacket;
- import net.minecraft.network.protocol.common.ServerboundPongPacket;
- import net.minecraft.network.protocol.common.ServerboundResourcePackPacket;
-+import net.minecraft.network.protocol.configuration.ClientConfigurationPacketListener;
- import net.minecraft.network.protocol.configuration.ClientboundFinishConfigurationPacket;
- import net.minecraft.network.protocol.configuration.ClientboundRegistryDataPacket;
- import net.minecraft.network.protocol.configuration.ClientboundUpdateEnabledFeaturesPacket;
-+import net.minecraft.network.protocol.configuration.ServerConfigurationPacketListener;
- import net.minecraft.network.protocol.configuration.ServerboundFinishConfigurationPacket;
- import net.minecraft.network.protocol.game.ClientGamePacketListener;
- import net.minecraft.network.protocol.game.ClientboundAddEntityPacket;
-@@ -147,6 +_,7 @@
- import net.minecraft.network.protocol.game.ClientboundUpdateMobEffectPacket;
- import net.minecraft.network.protocol.game.ClientboundUpdateRecipesPacket;
- import net.minecraft.network.protocol.game.ServerGamePacketListener;
-+import net.minecraft.network.protocol.game.ServerPacketListener;
- import net.minecraft.network.protocol.game.ServerboundAcceptTeleportationPacket;
- import net.minecraft.network.protocol.game.ServerboundBlockEntityTagQuery;
- import net.minecraft.network.protocol.game.ServerboundChangeDifficultyPacket;
-@@ -219,7 +_,7 @@
-     HANDSHAKING(
-         "handshake",
-         protocol()
--            .addFlow(PacketFlow.CLIENTBOUND, new ConnectionProtocol.PacketSet())
-+            .addFlow(PacketFlow.CLIENTBOUND, new ConnectionProtocol.PacketSet<ServerPacketListener>())
-             .addFlow(
-                 PacketFlow.SERVERBOUND,
-                 new ConnectionProtocol.PacketSet<ServerHandshakePacketListener>().addPacket(ClientIntentionPacket.class, ClientIntentionPacket::new)
-@@ -451,7 +_,7 @@
-         protocol()
-             .addFlow(
-                 PacketFlow.CLIENTBOUND,
--                new ConnectionProtocol.PacketSet<ClientCommonPacketListener>()
-+                new ConnectionProtocol.PacketSet<ClientConfigurationPacketListener>()
-                     .addPacket(ClientboundCustomPayloadPacket.class, ClientboundCustomPayloadPacket::new)
-                     .addPacket(ClientboundDisconnectPacket.class, ClientboundDisconnectPacket::new)
-                     .addPacket(ClientboundFinishConfigurationPacket.class, ClientboundFinishConfigurationPacket::new)
-@@ -465,7 +_,7 @@
-             )
-             .addFlow(
-                 PacketFlow.SERVERBOUND,
--                new ConnectionProtocol.PacketSet<ServerCommonPacketListener>()
-+                new ConnectionProtocol.PacketSet<ServerConfigurationPacketListener>()
-                     .addPacket(ServerboundClientInformationPacket.class, ServerboundClientInformationPacket::new)
-                     .addPacket(ServerboundCustomPayloadPacket.class, ServerboundCustomPayloadPacket::new)
-                     .addPacket(ServerboundFinishConfigurationPacket.class, ServerboundFinishConfigurationPacket::new)
diff --git a/versions/24w03a/patches/net/minecraft/network/codec/StreamCodec.java.patch b/versions/24w03a/patches/net/minecraft/network/codec/StreamCodec.java.patch
new file mode 100644
index 0000000..9f95a2c
--- /dev/null
+++ b/versions/24w03a/patches/net/minecraft/network/codec/StreamCodec.java.patch
@@ -0,0 +1,11 @@
+--- a/net/minecraft/network/codec/StreamCodec.java
++++ b/net/minecraft/network/codec/StreamCodec.java
+@@ -171,7 +_,7 @@
+     }
+ 
+     default <S extends B> StreamCodec<S, V> cast() {
+-        return this;
++        return (StreamCodec<S, V>) this;
+     }
+ 
+     @FunctionalInterface
diff --git a/versions/24w03a/patches/net/minecraft/network/protocol/common/custom/CustomPacketPayload.java.patch b/versions/24w03a/patches/net/minecraft/network/protocol/common/custom/CustomPacketPayload.java.patch
new file mode 100644
index 0000000..bb3ff38
--- /dev/null
+++ b/versions/24w03a/patches/net/minecraft/network/protocol/common/custom/CustomPacketPayload.java.patch
@@ -0,0 +1,11 @@
+--- a/net/minecraft/network/protocol/common/custom/CustomPacketPayload.java
++++ b/net/minecraft/network/protocol/common/custom/CustomPacketPayload.java
+@@ -36,7 +_,7 @@
+ 
+             private <T extends CustomPacketPayload> void writeCap(B friendlyByteBuf, CustomPacketPayload.Type<T> type, CustomPacketPayload customPacketPayload) {
+                 friendlyByteBuf.writeResourceLocation(type.id());
+-                StreamCodec<B, T> streamCodec = this.findCodec(type.id);
++                StreamCodec<B, T> streamCodec = (StreamCodec<B, T>) this.findCodec(type.id);
+                 streamCodec.encode(friendlyByteBuf, (T)customPacketPayload);
+             }
+ 
diff --git a/versions/24w03a/patches/net/minecraft/network/protocol/configuration/ClientboundUpdateEnabledFeaturesPacket.java.patch b/versions/24w03a/patches/net/minecraft/network/protocol/configuration/ClientboundUpdateEnabledFeaturesPacket.java.patch
index a9a42db..b4ccc9d 100644
--- a/versions/24w03a/patches/net/minecraft/network/protocol/configuration/ClientboundUpdateEnabledFeaturesPacket.java.patch
+++ b/versions/24w03a/patches/net/minecraft/network/protocol/configuration/ClientboundUpdateEnabledFeaturesPacket.java.patch
@@ -1,11 +1,11 @@
 --- a/net/minecraft/network/protocol/configuration/ClientboundUpdateEnabledFeaturesPacket.java
 +++ b/net/minecraft/network/protocol/configuration/ClientboundUpdateEnabledFeaturesPacket.java
-@@ -8,7 +_,7 @@
+@@ -14,7 +_,7 @@
+     );
  
- public record ClientboundUpdateEnabledFeaturesPacket(Set<ResourceLocation> features) implements Packet<ClientConfigurationPacketListener> {
-     public ClientboundUpdateEnabledFeaturesPacket(FriendlyByteBuf buffer) {
+     private ClientboundUpdateEnabledFeaturesPacket(FriendlyByteBuf buffer) {
 -        this(buffer.readCollection(HashSet::new, FriendlyByteBuf::readResourceLocation));
 +        this(buffer.<ResourceLocation, Set<ResourceLocation>>readCollection(HashSet::new, FriendlyByteBuf::readResourceLocation));
      }
  
-     @Override
+     private void write(FriendlyByteBuf buffer) {
diff --git a/versions/24w03a/patches/net/minecraft/network/syncher/EntityDataSerializer.java.patch b/versions/24w03a/patches/net/minecraft/network/syncher/EntityDataSerializer.java.patch
new file mode 100644
index 0000000..2049f09
--- /dev/null
+++ b/versions/24w03a/patches/net/minecraft/network/syncher/EntityDataSerializer.java.patch
@@ -0,0 +1,11 @@
+--- a/net/minecraft/network/syncher/EntityDataSerializer.java
++++ b/net/minecraft/network/syncher/EntityDataSerializer.java
+@@ -13,7 +_,7 @@
+     T copy(T value);
+ 
+     static <T> EntityDataSerializer<T> forValueType(StreamCodec<? super RegistryFriendlyByteBuf, T> streamCodec) {
+-        return () -> streamCodec;
++        return (ForValueType<T>) () -> streamCodec;
+     }
+ 
+     public interface ForValueType<T> extends EntityDataSerializer<T> {
diff --git a/versions/24w03a/patches/net/minecraft/server/MinecraftServer.java.patch b/versions/24w03a/patches/net/minecraft/server/MinecraftServer.java.patch
index aaaed24..fc0fa4d 100644
--- a/versions/24w03a/patches/net/minecraft/server/MinecraftServer.java.patch
+++ b/versions/24w03a/patches/net/minecraft/server/MinecraftServer.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -796,7 +_,7 @@
+@@ -787,7 +_,7 @@
      }
  
      @Override
diff --git a/versions/24w03a/patches/net/minecraft/server/level/ServerLevel.java.patch b/versions/24w03a/patches/net/minecraft/server/level/ServerLevel.java.patch
index c55d49c..e4a65ae 100644
--- a/versions/24w03a/patches/net/minecraft/server/level/ServerLevel.java.patch
+++ b/versions/24w03a/patches/net/minecraft/server/level/ServerLevel.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
-@@ -1553,7 +_,7 @@
+@@ -1554,7 +_,7 @@
  
              return map.object2IntEntrySet()
                  .stream()
diff --git a/versions/24w03a/patches/net/minecraft/util/datafix/DataFixers.java.patch b/versions/24w03a/patches/net/minecraft/util/datafix/DataFixers.java.patch
index c6cdee0..4187f70 100644
--- a/versions/24w03a/patches/net/minecraft/util/datafix/DataFixers.java.patch
+++ b/versions/24w03a/patches/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
-@@ -1016,7 +_,7 @@
+@@ -1017,7 +_,7 @@
          Schema schema161 = builder.addSchema(3086, SAME_NAMESPACED);
          builder.addFixer(
              new EntityVariantFix(
@@ -9,7 +9,7 @@
                      map5.defaultReturnValue("minecraft:tabby");
                      map5.put(0, "minecraft:tabby");
                      map5.put(1, "minecraft:black");
-@@ -1053,7 +_,7 @@
+@@ -1054,7 +_,7 @@
          Schema schema162 = builder.addSchema(3087, SAME_NAMESPACED);
          builder.addFixer(
              new EntityVariantFix(
diff --git a/versions/24w03a/patches/net/minecraft/world/entity/SpawnPlacements.java.patch b/versions/24w03a/patches/net/minecraft/world/entity/SpawnPlacements.java.patch
index 4c4d0e3..c25db79 100644
--- a/versions/24w03a/patches/net/minecraft/world/entity/SpawnPlacements.java.patch
+++ b/versions/24w03a/patches/net/minecraft/world/entity/SpawnPlacements.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/entity/SpawnPlacements.java
 +++ b/net/minecraft/world/entity/SpawnPlacements.java
-@@ -67,7 +_,7 @@
+@@ -68,7 +_,7 @@
          EntityType<T> entityType, ServerLevelAccessor serverLevel, MobSpawnType spawnType, BlockPos pos, RandomSource random
      ) {
          SpawnPlacements.Data data = DATA_BY_TYPE.get(entityType);
diff --git a/versions/24w03a/patches/net/minecraft/world/level/GameRules.java.patch b/versions/24w03a/patches/net/minecraft/world/level/GameRules.java.patch
index e4a8fce..64f96e7 100644
--- a/versions/24w03a/patches/net/minecraft/world/level/GameRules.java.patch
+++ b/versions/24w03a/patches/net/minecraft/world/level/GameRules.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/level/GameRules.java
 +++ b/net/minecraft/world/level/GameRules.java
-@@ -241,8 +_,8 @@
+@@ -250,8 +_,8 @@
      }
  
      private static <T extends GameRules.Value<T>> void callVisitorCap(GameRules.GameRuleTypeVisitor visitor, GameRules.Key<?> key, GameRules.Type<?> type) {