Remove explicit comparison to net.minecraft. package

Author: Lassebq

src/main/java/net/minecraft/launchwrapper/LaunchClassLoader.java

@@ -2,6 +2,7 @@
 
 import java.io.IOException;
 import java.net.URL;
+import java.security.ProtectionDomain;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
@@ -92,6 +93,14 @@ private String transformName(final String name) {
 		return name;
 	}
 
+	@Override
+	protected ProtectionDomain getProtectionDomain(String name) {
+		if (name.startsWith("net.minecraft.")) {
+			return null;
+		}
+		return super.getProtectionDomain(untransformName(name));
+	}
+
 	@Override
 	public void addURL(URL url) {
 		super.addURL(url);

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

@@ -402,42 +402,40 @@ private Class<?> defineClass(String name, byte[] classData, ProtectionDomain pro
 		return defineClass(name, classData, 0, classData.length, protectionDomain);
 	}
 
-	private ProtectionDomain getProtectionDomain(String name) {
-		final URL resource = getResource(classResourceName(name));
+	protected ProtectionDomain getProtectionDomain(String name) {
+		URL resource = getOriginalURL(classResourceName(name));
 		if (resource == null) {
 			return null;
 		}
 
 		CodeSigner[] signers = null;
 		int i = name.lastIndexOf('.');
 
-		// TODO avoid explicit net.minecraft comparison. Removing this condition breaks forge atm.
-		if (i != -1 && !name.startsWith("net.minecraft.")) {
-			try {
-				URLConnection urlConnection = resource.openConnection();
-				if (urlConnection instanceof JarURLConnection) {
-					final JarURLConnection jarURLConnection = (JarURLConnection)urlConnection;
-					JarFile jarFile;
-					jarFile = jarURLConnection.getJarFile();
-
-					if (jarFile != null && jarFile.getManifest() != null) {
-						final Manifest manifest = jarFile.getManifest();
-						final JarEntry entry = jarFile.getJarEntry(classResourceName(name));
+		try {
+			URLConnection urlConnection = resource.openConnection();
+			if (urlConnection instanceof JarURLConnection) {
+				final JarURLConnection jarURLConnection = (JarURLConnection)urlConnection;
+				JarFile jarFile;
+				jarFile = jarURLConnection.getJarFile();
+
+				if (jarFile != null && jarFile.getManifest() != null) {
+					final Manifest manifest = jarFile.getManifest();
+					final JarEntry entry = jarFile.getJarEntry(classResourceName(name));
+					if (entry != null) {
+						signers = entry.getCodeSigners();
+					}
+					if (i != -1) {
 						String pkgName = name.substring(0, i);
 
 						Package pkg = getPackage(pkgName);
-						// getClassBytes(name);
-						if (entry != null) {
-							signers = entry.getCodeSigners();
-						}
 						if (pkg == null) {
 							pkg = definePackage(pkgName, manifest, jarURLConnection.getJarFileURL());
 						}
 					}
 				}
-			} catch (IOException e) {
-				e.printStackTrace();
 			}
+		} catch (IOException e) {
+			e.printStackTrace();
 		}
 		URL newResource = resource;