Fix conflict

Shnupbups · Feb 29, 2024 · 054ae2e · 054ae2e
1 parent 3c77ac5
commit 054ae2e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/mappings/net/minecraft/component/Component.mapping b/mappings/net/minecraft/component/Component.mapping
@@ -6,9 +6,9 @@ CLASS net/minecraft/class_9336 net/minecraft/component/Component
 		ARG 0 type
 		ARG 1 value
 	CLASS 1
-		METHOD method_57949 decode (Lnet/minecraft/class_9129;Lnet/minecraft/class_9331;)Lnet/minecraft/class_9336;
+		METHOD method_57949 read (Lnet/minecraft/class_9129;Lnet/minecraft/class_9331;)Lnet/minecraft/class_9336;
 			ARG 0 buf
 			ARG 1 type
-		METHOD method_57951 encode (Lnet/minecraft/class_9129;Lnet/minecraft/class_9336;)V
+		METHOD method_57951 write (Lnet/minecraft/class_9129;Lnet/minecraft/class_9336;)V
 			ARG 0 buf
 			ARG 1 component