diff --git a/mappings/net/minecraft/client/resource/pack/ResourcePackDirectory.mapping b/mappings/net/minecraft/client/resource/pack/DirectoryResourcePack.mapping
similarity index 54%
rename from mappings/net/minecraft/client/resource/pack/ResourcePackDirectory.mapping
rename to mappings/net/minecraft/client/resource/pack/DirectoryResourcePack.mapping
index 32b4890b41..60c1011ec2 100644
--- a/mappings/net/minecraft/client/resource/pack/ResourcePackDirectory.mapping
+++ b/mappings/net/minecraft/client/resource/pack/DirectoryResourcePack.mapping
@@ -1,4 +1,6 @@
-CLASS none/bxv net/minecraft/client/resource/pack/ResourcePackDirectory
+CLASS none/bxv net/minecraft/client/resource/pack/DirectoryResourcePack
+	FIELD b WINDOWS Z
+	FIELD c PATH_SEP_WINDOWS Lcom/google/common/base/CharMatcher;
 	METHOD a openByPath (Ljava/lang/String;)Ljava/io/InputStream;
 		ARG 0 path
 	METHOD b canHandleByPath (Ljava/lang/String;)Z
diff --git a/mappings/net/minecraft/client/resource/pack/ResourcePackMinecraft.mapping b/mappings/net/minecraft/client/resource/pack/MinecraftResourcePack.mapping
similarity index 82%
rename from mappings/net/minecraft/client/resource/pack/ResourcePackMinecraft.mapping
rename to mappings/net/minecraft/client/resource/pack/MinecraftResourcePack.mapping
index ed84c880ab..93be1a3109 100644
--- a/mappings/net/minecraft/client/resource/pack/ResourcePackMinecraft.mapping
+++ b/mappings/net/minecraft/client/resource/pack/MinecraftResourcePack.mapping
@@ -1,4 +1,4 @@
-CLASS none/bxr net/minecraft/client/resource/pack/ResourcePackMinecraft
+CLASS none/bxr net/minecraft/client/resource/pack/MinecraftResourcePack
 	FIELD a ASSET_NAMES Ljava/util/Set;
 	METHOD a getLogo ()Ljava/awt/image/BufferedImage;
 	METHOD a open (Lnone/kp;)Ljava/io/InputStream;
diff --git a/mappings/net/minecraft/client/resource/pack/ResourcePackPhysical.mapping b/mappings/net/minecraft/client/resource/pack/PhysicalResourcePack.mapping
similarity index 90%
rename from mappings/net/minecraft/client/resource/pack/ResourcePackPhysical.mapping
rename to mappings/net/minecraft/client/resource/pack/PhysicalResourcePack.mapping
index 85ac3673bd..473b7a4b5a 100644
--- a/mappings/net/minecraft/client/resource/pack/ResourcePackPhysical.mapping
+++ b/mappings/net/minecraft/client/resource/pack/PhysicalResourcePack.mapping
@@ -1,4 +1,4 @@
-CLASS none/bxo net/minecraft/client/resource/pack/ResourcePackPhysical
+CLASS none/bxo net/minecraft/client/resource/pack/PhysicalResourcePack
 	FIELD a location Ljava/io/File;
 	FIELD b LOGGER Lorg/apache/logging/log4j/Logger;
 	METHOD <init> (Ljava/io/File;)V
diff --git a/mappings/net/minecraft/client/resource/pack/ResourcePackFile.mapping b/mappings/net/minecraft/client/resource/pack/ResourcePackFile.mapping
deleted file mode 100644
index 7a6b9bbc66..0000000000
--- a/mappings/net/minecraft/client/resource/pack/ResourcePackFile.mapping
+++ /dev/null
@@ -1,6 +0,0 @@
-CLASS none/bxu net/minecraft/client/resource/pack/ResourcePackFile
-	METHOD a openByPath (Ljava/lang/String;)Ljava/io/InputStream;
-		ARG 0 path
-	METHOD b canHandleByPath (Ljava/lang/String;)Z
-		ARG 0 path
-	METHOD c getProvidedAssets ()Ljava/util/Set;
diff --git a/mappings/net/minecraft/client/resource/pack/ZipFileResourcePack.mapping b/mappings/net/minecraft/client/resource/pack/ZipFileResourcePack.mapping
new file mode 100644
index 0000000000..8d4c6d9e6f
--- /dev/null
+++ b/mappings/net/minecraft/client/resource/pack/ZipFileResourcePack.mapping
@@ -0,0 +1,9 @@
+CLASS none/bxu net/minecraft/client/resource/pack/ZipFileResourcePack
+	FIELD c zipFile Ljava/util/zip/ZipFile;
+	METHOD a openByPath (Ljava/lang/String;)Ljava/io/InputStream;
+		ARG 0 path
+	METHOD b canHandleByPath (Ljava/lang/String;)Z
+		ARG 0 path
+	METHOD c getProvidedAssets ()Ljava/util/Set;
+	METHOD close close ()V
+	METHOD d getOrCreateZipFile ()Ljava/util/zip/ZipFile;
diff --git a/mappings/net/minecraft/client/util/ResourceNotFoundException.mapping b/mappings/net/minecraft/client/util/ResourceNotFoundException.mapping
new file mode 100644
index 0000000000..0f52db724d
--- /dev/null
+++ b/mappings/net/minecraft/client/util/ResourceNotFoundException.mapping
@@ -0,0 +1 @@
+CLASS none/bye net/minecraft/client/util/ResourceNotFoundException