Don't include CCL interface - doesn't actually solve anything

MinimallyCorrect · Jan 20, 2017 · a382f6c · a382f6c
1 parent c7a326b
commit a382f6c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/build.gradle b/build.gradle
@@ -157,11 +157,6 @@ def apiJarConfig = {
 		include 'me/nallar/modpatcher/ModPatcher$Version.*'
 		include 'me/nallar/modpatcher/ModPatcherSetup.*'
 	}
-	from((configurations.provided).filter { it.exists() }.collect {
-		it.isDirectory() ? it : zipTree(it)
-	}) {
-		include 'net/minecraft/launchwrapper/nallar/cachingclassloader/CachingClassLoader.*'
-	}
 }
 
 task apiJar(type: Jar, dependsOn: classes)

diff --git a/src/main/java/me/nallar/modpatcher/ModPatcher.java b/src/main/java/me/nallar/modpatcher/ModPatcher.java
@@ -4,7 +4,6 @@
 import com.google.common.io.Resources;
 import me.nallar.javapatcher.patcher.Patcher;
 import net.minecraft.launchwrapper.LaunchClassLoader;
-import net.minecraft.launchwrapper.nallar.cachingclassloader.CachingClassLoader;
 import net.minecraftforge.fml.relauncher.ReflectionHelper;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -234,10 +233,7 @@ private static void addToCurrentClassLoader() {
 				try {
 					// No, IDEA, it's not always true
 					//noinspection ConstantConditions
-					if (lcl instanceof CachingClassLoader) {
-						CachingClassLoader ccl = (CachingClassLoader) lcl;
-						ccl.clearFailures(ModPatcher::removeModPatcherEntries);
-					}
+					lcl.clearFailures(ModPatcher::removeModPatcherEntries);
 					cclInvalidNegativeCleared = true;
 				} catch (NoClassDefFoundError ignored) {
 				}