diff --git a/build.gradle b/build.gradle
index c56474f93..99776eb2e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1286,7 +1286,7 @@ javadoc {
 		links(
 				'https://guava.dev/releases/21.0/api/docs/',
 				'https://www.javadoc.io/doc/com.google.code.gson/gson/2.8.0/',
-				'https://logging.apache.org/log4j/2.x/log4j-api/apidocs/',
+				'https://logging.apache.org/log4j/2.x/javadoc/log4j-api/',
 				// jsr305 need to come before jdk or the anno links are broken
 				'https://www.javadoc.io/doc/com.google.code.findbugs/jsr305/3.0.2/',
 				'https://javadoc.lwjgl.org/',
@@ -1296,8 +1296,8 @@ javadoc {
 				'https://commons.apache.org/proper/commons-lang/javadocs/api-3.5',
 				'https://commons.apache.org/proper/commons-io/javadocs/api-2.5',
 				'https://commons.apache.org/proper/commons-codec/archives/1.10/apidocs',
-				'https://commons.apache.org/proper/commons-compress/javadocs/api-1.8.1/',
-				"https://maven.quiltmc.org/javadocs/release/net/quiltmc/quilt-loader-${project.quilt_loader_version}/",
+				'https://javadoc.io/doc/org.apache.commons/commons-compress/1.8.1',
+//				"https://maven.quiltmc.org/javadocs/release/org/quiltmc/quilt-loader-${project.quilt_loader_version}/",
 				"https://docs.oracle.com/en/java/javase/11/docs/api/"
 				// Need to add loader jd publication for env annotations!
 		)
diff --git a/gradle.properties b/gradle.properties
index 9acd2e8f0..b5b915c69 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,5 +12,5 @@ procyon_version=0.5.35.13
 quilt_enigma_plugin_version=1.3.0
 
 # Loader is only used by javadoc generation/linking
-quilt_loader_version=0.17.8
+quilt_loader_version=0.21.1
 mapping_poet_version=0.3.0
diff --git a/mappings/12w30a-client#12w27a-client.tinydiff b/mappings/12w30a-client#12w27a-client.tinydiff
index 5a1cfb00b..8dde62c9a 100644
--- a/mappings/12w30a-client#12w27a-client.tinydiff
+++ b/mappings/12w30a-client#12w27a-client.tinydiff
@@ -2317,13 +2317,13 @@ c	net/minecraft/unmapped/C_8814675		net/minecraft/client/Minecraft__2
 c	net/minecraft/unmapped/C_8975022		net/minecraft/client/options/GameOptions__1
 	f	[I	f_3530304		f_3530304
 	m	()V	<clinit>		<clinit>
-c	net/minecraft/unmapped/C_9029783		net/minecraft/unmapped/C_9029783
-	f	Ljava/io/File;	f_8719633		f_8719633
-	f	Lnet/minecraft/client/Minecraft;	f_6145320		f_6145320
-	f	Z	f_0545767		f_0545767
+c	net/minecraft/unmapped/C_9029783		net/minecraft/client/resource/ResourceDownloadThread
+	f	Ljava/io/File;	f_8719633		workingDirectory
+	f	Lnet/minecraft/client/Minecraft;	f_6145320		client
+	f	Z	f_0545767		cancelled
 	m	(Ljava/io/File;Lnet/minecraft/client/Minecraft;)V	<init>		<init>
-		p	1			p_1
-		p	2			p_2
+		p	1			parentDirectory
+		p	2			client
 	m	()V	run		run
 	m	()V	m_5855120		m_5855120
 	m	(Ljava/io/File;Ljava/lang/String;)V	m_9704077		m_9704077
@@ -2334,11 +2334,11 @@ c	net/minecraft/unmapped/C_9029783		net/minecraft/unmapped/C_9029783
 		p	2			p_2
 		p	3			p_3
 		p	5			p_5
-	m	(Ljava/net/URL;Ljava/io/File;J)V	m_3833599		m_3833599
-		p	1			p_1
-		p	2			p_2
-		p	3			p_3
-	m	()V	m_4717471		m_4717471
+	m	(Ljava/net/URL;Ljava/io/File;J)V	m_3833599		readToFile
+		p	1			fileURL
+		p	2			output
+		p	3			unused
+	m	()V	m_4717471		cancel
 c	net/minecraft/unmapped/C_9236886		net/minecraft/unmapped/C_9236886
 	f	Ljava/util/Map;	f_7576749		f_7576749
 	f	Ljava/util/List;	f_2807585		f_2807585
diff --git a/mappings/a1.0.6-client#a1.0.5_01-client.tinydiff b/mappings/a1.0.6-client#a1.0.5_01-client.tinydiff
index 27af63fed..61cf07a2a 100644
--- a/mappings/a1.0.6-client#a1.0.5_01-client.tinydiff
+++ b/mappings/a1.0.6-client#a1.0.5_01-client.tinydiff
@@ -729,11 +729,11 @@ c	net/minecraft/unmapped/C_8651652
 	m	(Lnet/minecraft/unmapped/C_5664496;)V	<init>		<init>
 		p	1			p_1
 c	net/minecraft/unmapped/C_9029783
-	f	Lnet/minecraft/client/Minecraft;	f_6145320	f_6145320	
-	f	Lnet/minecraft/unmapped/C_5664496;	f_6145320		f_6145320
+	f	Lnet/minecraft/client/Minecraft;	f_6145320	client	
+	f	Lnet/minecraft/unmapped/C_5664496;	f_6145320		client
 	m	(Ljava/io/File;Lnet/minecraft/client/Minecraft;)V	<init>	<init>	
-		p	1		p_1	
-		p	2		p_2	
+		p	1		parentDirectory	
+		p	2		client	
 	m	(Ljava/io/File;Lnet/minecraft/unmapped/C_5664496;)V	<init>		<init>
 		p	1			p_1
 		p	2			p_2
diff --git a/mappings/a1.1.0-131933-client#a1.0.17_04-client.tinydiff b/mappings/a1.1.0-131933-client#a1.0.17_04-client.tinydiff
index bf2f21d27..a8a025a73 100644
--- a/mappings/a1.1.0-131933-client#a1.0.17_04-client.tinydiff
+++ b/mappings/a1.1.0-131933-client#a1.0.17_04-client.tinydiff
@@ -134,7 +134,7 @@ c	net/minecraft/unmapped/C_8398976
 		p	3		p_3	
 		p	4		p_4	
 c	net/minecraft/unmapped/C_9029783
-	m	()V	m_4717471	m_4717471	
+	m	()V	m_4717471	cancel	
 c	net/minecraft/unmapped/C_9693816
 	f	Z	f_1503338	f_1503338	
 	m	()V	<clinit>	<clinit>	
diff --git a/mappings/a1.1.2_01-client#a1.1.2-client.tinydiff b/mappings/a1.1.2_01-client#a1.1.2-client.tinydiff
index f578435a6..a4c1bf37f 100644
--- a/mappings/a1.1.2_01-client#a1.1.2-client.tinydiff
+++ b/mappings/a1.1.2_01-client#a1.1.2-client.tinydiff
@@ -5,15 +5,15 @@ c	net/minecraft/unmapped/C_9029783
 		p	2		p_2	
 		p	3		p_3	
 		p	5		p_5	
-	m	(Ljava/net/URL;Ljava/io/File;J)V	m_3833599	m_3833599	
-		p	1		p_1	
-		p	2		p_2	
-		p	3		p_3	
+	m	(Ljava/net/URL;Ljava/io/File;J)V	m_3833599	readToFile	
+		p	1		fileURL	
+		p	2		output	
+		p	3		unused	
 	m	(Ljava/net/URL;Ljava/lang/String;I)V	m_9093389		m_9093389
 		p	1			p_1
 		p	2			p_2
 		p	3			p_3
-	m	(Ljava/net/URL;Ljava/io/File;I)V	m_3833599		m_3833599
+	m	(Ljava/net/URL;Ljava/io/File;I)V	m_3833599		readToFile
 		p	1			p_1
 		p	2			p_2
 		p	3			p_3
diff --git a/mappings/inf-20100627-client#inf-20100625-1917-client.tinydiff b/mappings/inf-20100627-client#inf-20100625-1917-client.tinydiff
index 6b2d2eae2..7fa75edcf 100644
--- a/mappings/inf-20100627-client#inf-20100625-1917-client.tinydiff
+++ b/mappings/inf-20100627-client#inf-20100625-1917-client.tinydiff
@@ -755,15 +755,15 @@ c	net/minecraft/unmapped/C_8938952	net/minecraft/client/gui/screen/TitleScreen
 		p	1		p_1	
 		p	2		p_2	
 		p	3		p_3	
-c	net/minecraft/unmapped/C_9029783	net/minecraft/unmapped/C_9029783	
-	f	Ljava/io/File;	f_8719633	f_8719633	
-	f	Lnet/minecraft/unmapped/C_5664496;	f_6145320	f_6145320	
-	f	Z	f_0545767	f_0545767	
+c	net/minecraft/unmapped/C_9029783	net/minecraft/client/resource/ResourceDownloadThread	
+	f	Ljava/io/File;	f_8719633	workingDirectory	
+	f	Lnet/minecraft/unmapped/C_5664496;	f_6145320	client	
+	f	Z	f_0545767	cancelled	
 	m	(Ljava/io/File;Lnet/minecraft/unmapped/C_5664496;)V	<init>	<init>	
 		p	1		p_1	
 		p	2		p_2	
 	m	()V	run	run	
-	m	(Ljava/net/URL;Ljava/io/File;)V	m_3833599	m_3833599	
+	m	(Ljava/net/URL;Ljava/io/File;)V	m_3833599	readToFile	
 		p	1		p_1	
 		p	2		p_2	
 c	net/minecraft/unmapped/C_9399468
diff --git a/mappings/inf-20100630-1340-client#inf-20100629-client.tinydiff b/mappings/inf-20100630-1340-client#inf-20100629-client.tinydiff
index f86df5264..2b2dc8d90 100644
--- a/mappings/inf-20100630-1340-client#inf-20100629-client.tinydiff
+++ b/mappings/inf-20100630-1340-client#inf-20100629-client.tinydiff
@@ -1380,12 +1380,12 @@ c	net/minecraft/unmapped/C_9029783
 	m	(Ljava/net/URL;Ljava/lang/String;)V	m_9093389	m_9093389	
 		p	1		p_1	
 		p	2		p_2	
-	m	(Ljava/net/URL;Ljava/io/File;I)V	m_3833599	m_3833599	
+	m	(Ljava/net/URL;Ljava/io/File;I)V	m_3833599	readToFile	
 		p	1		p_1	
 		p	2		p_2	
 		p	3		p_3	
 	m	()V	m_5855120	m_5855120	
-	m	(Ljava/net/URL;Ljava/io/File;)V	m_3833599		m_3833599
+	m	(Ljava/net/URL;Ljava/io/File;)V	m_3833599		readToFile
 		p	1			p_1
 		p	2			p_2
 c	net/minecraft/unmapped/C_9079092