Fix error with inconsistent transformations

MinimallyCorrect · Feb 28, 2016 · 25c2616 · 25c2616
1 parent 648a39d
commit 25c2616
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/src/main/java/me/nallar/modpatcher/LaunchClassLoaderUtil.java b/src/main/java/me/nallar/modpatcher/LaunchClassLoaderUtil.java
@@ -171,7 +171,7 @@ public static byte[] getSrgBytes(String name) {
 	public static void cacheSrgBytes(String transformedName, byte[] bytes) {
 		byte[] old = cachedSrgClasses.put(transformedName, bytes);
 		if (old != null && !Arrays.equals(bytes, old)) {
-			ModPatcher.pool.dropCache(transformedName);
+			ModPatcherTransformer.pool.dropCache(transformedName);
 			PatcherLog.error(null, new Error("Inconsistent transformation results. Tried to cache different bytes for class " + transformedName + " to previous result after transformation."));
 		}
 	}

diff --git a/src/main/java/me/nallar/modpatcher/ModPatcherTransformer.java b/src/main/java/me/nallar/modpatcher/ModPatcherTransformer.java
@@ -11,6 +11,7 @@
 import java.nio.file.*;
 
 class ModPatcherTransformer {
+	public static final ClassLoaderPool pool;
 	private static final String MOD_PATCHES_DIRECTORY = "./ModPatches/";
 	private static final Patcher patcher;
 	private static final String ALREADY_LOADED_PROPERTY_NAME = "nallar.ModPatcher.alreadyLoaded";
@@ -24,17 +25,11 @@ class ModPatcherTransformer {
 
 		checkForMultipleClassLoads();
 
-		patcher = createPatcher();
-	}
-
-	private static Patcher createPatcher() {
 		try {
-			Patcher patcher = new Patcher(new ClassLoaderPool(), Patches.class, new MCPMappings());
+			patcher = new Patcher(pool = new ClassLoaderPool(), Patches.class, new MCPMappings());
 
 			// TODO - issue #2. Determine layout/config file structure
 			recursivelyAddXmlFiles(new File(MOD_PATCHES_DIRECTORY), patcher);
-
-			return patcher;
 		} catch (Throwable t) {
 			throw logError("Failed to create Patcher", t);
 		}