diff --git a/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/mixin/networking/client/ClientCommonNetworkHandlerMixin.java b/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/mixin/networking/client/ClientCommonNetworkHandlerMixin.java
index 8205144862..2a004b4dbf 100644
--- a/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/mixin/networking/client/ClientCommonNetworkHandlerMixin.java
+++ b/fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/mixin/networking/client/ClientCommonNetworkHandlerMixin.java
@@ -54,7 +54,7 @@ public void onCustomPayload(CustomPayloadS2CPacket packet, CallbackInfo ci) {
 
 			if (!handled && payload instanceof RetainedPayload retained && retained.buf().refCnt() > 0) {
 				// Duplicate the vanilla log message, as we cancel further processing.
-				LOGGER.warn("Unknown custom packet payload: {}", payload.method_56479().id());
+				LOGGER.warn("Unknown custom packet payload: {}", payload.getKey().id());
 
 				retained.buf().skipBytes(retained.buf().readableBytes());
 				retained.buf().release();
diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/api/networking/v1/PacketSender.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/api/networking/v1/PacketSender.java
index 949da43397..bb553977a1 100644
--- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/api/networking/v1/PacketSender.java
+++ b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/api/networking/v1/PacketSender.java
@@ -79,7 +79,7 @@ default void sendPacket(CustomPayload payload) {
 //		payload.write(buf);
 		// TODO 1.20.5
 		assert false;
-		sendPacket(payload.method_56479().id(), buf);
+		sendPacket(payload.getKey().id(), buf);
 	}
 
 	/**
@@ -111,7 +111,7 @@ default void sendPacket(CustomPayload payload, @Nullable GenericFutureListener<?
 //		payload.write(buf);
 		// TODO 1.20.5
 		assert false;
-		sendPacket(payload.method_56479().id(), buf, callback);
+		sendPacket(payload.getKey().id(), buf, callback);
 	}
 
 	/**
@@ -143,7 +143,7 @@ default void sendPacket(CustomPayload payload, @Nullable PacketCallbacks callbac
 //		payload.write(buf);
 		// TODO 1.20.5
 		assert false;
-		sendPacket(payload.method_56479().id(), buf, callback);
+		sendPacket(payload.getKey().id(), buf, callback);
 	}
 
 	/**
diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/AbstractChanneledNetworkAddon.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/AbstractChanneledNetworkAddon.java
index c7d32f7e9f..a262c4024d 100644
--- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/AbstractChanneledNetworkAddon.java
+++ b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/AbstractChanneledNetworkAddon.java
@@ -74,7 +74,7 @@ protected void registerPendingChannels(ChannelInfoHolder holder, NetworkState st
 
 	// always supposed to handle async!
 	public boolean handle(ResolvablePayload resolvable) {
-		Identifier channelName = resolvable.method_56479().id();
+		Identifier channelName = resolvable.getKey().id();;
 		this.logger.debug("Handling inbound packet from channel with name \"{}\"", channelName);
 
 		// Handle reserved packets
diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/CommonRegisterPayload.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/CommonRegisterPayload.java
index 2377f735a6..59213fedaf 100644
--- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/CommonRegisterPayload.java
+++ b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/CommonRegisterPayload.java
@@ -50,7 +50,7 @@ public CommonRegisterPayload(PacketByteBuf buf) {
 //	}
 
 	@Override
-	public class_9154<? extends CustomPayload> method_56479() {
+	public Type<? extends CustomPayload> getKey() {
 		// TODO 1.20.5
 		throw new UnsupportedOperationException();
 	}
diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/CommonVersionPayload.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/CommonVersionPayload.java
index a834559d06..0f6b792e8d 100644
--- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/CommonVersionPayload.java
+++ b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/CommonVersionPayload.java
@@ -38,7 +38,7 @@ public CommonVersionPayload(PacketByteBuf buf) {
 //	}
 
 	@Override
-	public class_9154<? extends CustomPayload> method_56479() {
+	public Type<? extends CustomPayload> getKey() {
 		// TODO 1.20.5
 		throw new UnsupportedOperationException();
 	}
diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/payload/RetainedPayload.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/payload/RetainedPayload.java
index 3148a6f33c..6818d45fa8 100644
--- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/payload/RetainedPayload.java
+++ b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/payload/RetainedPayload.java
@@ -16,6 +16,7 @@
 
 package net.fabricmc.fabric.impl.networking.payload;
 
+import net.minecraft.network.codec.PacketCodec;
 import net.minecraft.network.packet.CustomPayload;
 
 import org.jetbrains.annotations.Nullable;
@@ -50,7 +51,7 @@ public ResolvedPayload resolve(@Nullable PacketType<?> type) {
 	}
 
 	@Override
-	public class_9154<? extends CustomPayload> method_56479() {
+	public Type<? extends CustomPayload> getKey() {
 		// TODO 1.20.5
 		throw new UnsupportedOperationException();
 	}
diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/payload/TypedPayload.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/payload/TypedPayload.java
index 6b52529188..61d02b223a 100644
--- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/payload/TypedPayload.java
+++ b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/payload/TypedPayload.java
@@ -50,7 +50,7 @@ public ResolvedPayload resolve(@Nullable PacketType<?> type) {
 //	}
 
 	@Override
-	public class_9154<? extends CustomPayload> method_56479() {
+	public Type<? extends CustomPayload> getKey() {
 		// TODO 1.20.5
 		throw new UnsupportedOperationException();
 	}
diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/payload/UntypedPayload.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/payload/UntypedPayload.java
index 947206c1cf..24549c2c2c 100644
--- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/payload/UntypedPayload.java
+++ b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/payload/UntypedPayload.java
@@ -55,7 +55,7 @@ public PacketByteBuf buffer() {
 	}
 
 	@Override
-	public class_9154<? extends CustomPayload> method_56479() {
+	public Type<? extends CustomPayload> getKey() {
 		// TODO 1.20.5
 		throw new UnsupportedOperationException();
 	}
diff --git a/fabric-particles-v1/src/main/java/net/fabricmc/fabric/api/particle/v1/FabricParticleTypes.java b/fabric-particles-v1/src/main/java/net/fabricmc/fabric/api/particle/v1/FabricParticleTypes.java
index 6e90fc747a..05af91a31b 100644
--- a/fabric-particles-v1/src/main/java/net/fabricmc/fabric/api/particle/v1/FabricParticleTypes.java
+++ b/fabric-particles-v1/src/main/java/net/fabricmc/fabric/api/particle/v1/FabricParticleTypes.java
@@ -18,8 +18,8 @@
 
 import com.mojang.serialization.Codec;
 
-import net.minecraft.class_9129;
-import net.minecraft.class_9139;
+import net.minecraft.network.codec.PacketCodec;
+import net.minecraft.network.codec.RegistryByteBuf;
 import net.minecraft.particle.DefaultParticleType;
 import net.minecraft.particle.ParticleEffect;
 import net.minecraft.particle.ParticleType;
@@ -84,7 +84,7 @@ public Codec<T> getCodec() {
 			}
 
 			@Override
-			public class_9139<? super class_9129, T> method_56179() {
+			public PacketCodec<? super RegistryByteBuf, T> getPacketCodec() {
 				// TODO 1.20.5 fix me
 				return null;
 			}
diff --git a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/api/recipe/v1/ingredient/CustomIngredientSerializer.java b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/api/recipe/v1/ingredient/CustomIngredientSerializer.java
index 04863067a5..9ebf515a71 100644
--- a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/api/recipe/v1/ingredient/CustomIngredientSerializer.java
+++ b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/api/recipe/v1/ingredient/CustomIngredientSerializer.java
@@ -17,13 +17,10 @@
 package net.fabricmc.fabric.api.recipe.v1.ingredient;
 
 import com.mojang.serialization.Codec;
-
-import net.minecraft.class_9129;
-import net.minecraft.class_9139;
-
 import org.jetbrains.annotations.Nullable;
 
-import net.minecraft.network.PacketByteBuf;
+import net.minecraft.network.codec.PacketCodec;
+import net.minecraft.network.codec.RegistryByteBuf;
 import net.minecraft.recipe.Ingredient;
 import net.minecraft.util.Identifier;
 
@@ -69,5 +66,5 @@ static CustomIngredientSerializer<?> get(Identifier identifier) {
 	 */
 	Codec<T> getCodec(boolean allowEmpty);
 
-	class_9139<class_9129, T> getPacketCodec();
+	PacketCodec<RegistryByteBuf, T> getPacketCodec();
 }
diff --git a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/CombinedIngredient.java b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/CombinedIngredient.java
index 5b90640b93..2564974c24 100644
--- a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/CombinedIngredient.java
+++ b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/CombinedIngredient.java
@@ -23,9 +23,10 @@
 
 import com.mojang.serialization.Codec;
 
-import net.minecraft.class_9129;
-import net.minecraft.class_9139;
+
 import net.minecraft.network.PacketByteBuf;
+import net.minecraft.network.codec.PacketCodec;
+import net.minecraft.network.codec.RegistryByteBuf;
 import net.minecraft.recipe.Ingredient;
 import net.minecraft.util.Identifier;
 
@@ -85,7 +86,7 @@ public Codec<I> getCodec(boolean allowEmpty) {
 		}
 
 		@Override
-		public class_9139<class_9129, I> getPacketCodec() {
+		public PacketCodec<RegistryByteBuf, I> getPacketCodec() {
 			// TODO 1.20.5
 			throw new UnsupportedOperationException("");
 		}
diff --git a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/DifferenceIngredient.java b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/DifferenceIngredient.java
index b337486ec1..a854a282e3 100644
--- a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/DifferenceIngredient.java
+++ b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/DifferenceIngredient.java
@@ -22,10 +22,10 @@
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 
-import net.minecraft.class_9129;
-import net.minecraft.class_9139;
 import net.minecraft.item.ItemStack;
 import net.minecraft.network.PacketByteBuf;
+import net.minecraft.network.codec.PacketCodec;
+import net.minecraft.network.codec.RegistryByteBuf;
 import net.minecraft.recipe.Ingredient;
 import net.minecraft.util.Identifier;
 
@@ -98,7 +98,7 @@ public Codec<DifferenceIngredient> getCodec(boolean allowEmpty) {
 		}
 
 		@Override
-		public class_9139<class_9129, DifferenceIngredient> getPacketCodec() {
+		public PacketCodec<RegistryByteBuf, DifferenceIngredient> getPacketCodec() {
 			// TODO 1.20.5
 			throw new UnsupportedOperationException();
 		}
diff --git a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/NbtIngredient.java b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/NbtIngredient.java
index c086d55b64..97fa2bc030 100644
--- a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/NbtIngredient.java
+++ b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/NbtIngredient.java
@@ -26,8 +26,9 @@
 import com.mojang.serialization.DataResult;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 
-import net.minecraft.class_9129;
-import net.minecraft.class_9139;
+import net.minecraft.network.codec.PacketCodec;
+
+import net.minecraft.network.codec.RegistryByteBuf;
 
 import org.jetbrains.annotations.Nullable;
 
@@ -148,7 +149,7 @@ public Codec<NbtIngredient> getCodec(boolean allowEmpty) {
 		}
 
 		@Override
-		public class_9139<class_9129, NbtIngredient> getPacketCodec() {
+		public PacketCodec<RegistryByteBuf, NbtIngredient> getPacketCodec() {
 			// TODO 1.20.5
 			throw new UnsupportedOperationException("");
 		}
diff --git a/gradle.properties b/gradle.properties
index 57588f8e37..0cd3b29b1b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ fabric.loom.multiProjectOptimisation=true
 
 version=0.94.0
 minecraft_version=24w03a
-yarn_version=+build.1
+yarn_version=+build.6
 loader_version=0.15.6
 installer_version=0.11.1