Fix loading of .class resources to include patched classes

Author: Lassebq

src/main/java/org/mcphackers/launchwrapper/loader/ClassLoaderURLHandler.java

@@ -1,10 +1,8 @@
 package org.mcphackers.launchwrapper.loader;
 
-import static org.objectweb.asm.ClassWriter.COMPUTE_FRAMES;
-import static org.objectweb.asm.ClassWriter.COMPUTE_MAXS;
+import static org.objectweb.asm.ClassWriter.*;
 
 import java.io.ByteArrayInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
@@ -35,13 +33,14 @@ public void connect() throws IOException {
 		@Override
 		public InputStream getInputStream() throws IOException {
 			String path = url.getPath();
-			byte[] data = classLoader.overridenResources.get(LaunchClassLoader.classNameFromResource(path));
+			byte[] data = classLoader.overridenResources.get(path);
 			if (data != null) {
 				return new ByteArrayInputStream(data);
 			}
-			ClassNode node = classLoader.overridenClasses.get(path);
+			ClassNode node = classLoader.overridenClasses.get(LaunchClassLoader.classNameFromResource(path));
 			if (node == null) {
-				throw new FileNotFoundException();
+				InputStream is = classLoader.getOriginalURL(path).openStream();
+				return is;
 			}
 			ClassWriter writer = new SafeClassWriter(classLoader, COMPUTE_MAXS | COMPUTE_FRAMES);
 			node.accept(writer);

src/main/java/org/mcphackers/launchwrapper/loader/LaunchClassLoader.java

@@ -144,7 +144,7 @@ public URL findResource(String resource) {
 		return getOriginalURL(resource);
 	}
 
-	private URL getOriginalURL(String resource) {
+	URL getOriginalURL(String resource) {
 		URL url = urlClassLoader.findResource(resource);
 		if (url != null) {
 			return url;
@@ -164,7 +164,7 @@ private URL getOverridenResourceURL(String resource) {
 					originalUrl.getProtocol(),
 					originalUrl.getHost(),
 					originalUrl.getPort(),
-					originalUrl.getFile(),
+					resource,
 					new ClassLoaderURLHandler(this));
 			}
 		} catch (MalformedURLException ignored) {
@@ -497,9 +497,9 @@ public static String classResourceName(String name) {
 
 	public static String classNameFromResource(String resource) {
 		if (resource.endsWith(".class")) {
-			return resource.substring(0, resource.length() - 6);
+			return resource.substring(0, resource.length() - 6).replace('/', '.');
 		}
-		return resource;
+		return null;
 	}
 
 	public static LaunchClassLoader instantiate() {