ModPatcher is now a lazy-loaded singleton. Add classloader exclusions…

… for javassist and me.nallar.modpatcher classes
MinimallyCorrect · Jan 6, 2016 · 773b4ff · 773b4ff
1 parent 0eba8dd
commit 773b4ff
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/src/main/java/me/nallar/modpatcher/ModPatcher.java b/src/main/java/me/nallar/modpatcher/ModPatcher.java
@@ -10,7 +10,7 @@
 import java.nio.file.*;
 
 public class ModPatcher implements IClassTransformer {
-	public static final String MOD_PATCHES_DIRECTORY = "./ModPatches/";
+	private static final String MOD_PATCHES_DIRECTORY = "./ModPatches/";
 	private static final Patcher patcher;
 	private static final String ALREADY_LOADED_PROPERTY_NAME = "nallar.ModPatcher.alreadyLoaded";
 	private static final String DUMP_PROPERTY_NAME = "nallar.ModPatcher.dump";
@@ -53,7 +53,7 @@ public static Patcher getPatcher() {
 	 * @return Name of the ModPatcher setup class
 	 */
 	public static String getSetupClass() {
-		return "me.nallar.modpatcher.ModPatcherSetupClass";
+		return "me.nallar.modpatcher.ModPatcherSetup";
 	}
 
 	private static void recursivelyAddXmlFiles(File directory, Patcher patcher) {
@@ -98,6 +98,10 @@ static void modPatcherAsCoreModStartup() {
 		}
 	}
 
+	public static IClassTransformer getInstance() {
+		return LazyModPatcherHolder.INSTANCE;
+	}
+
 	@Override
 	public byte[] transform(String name, String transformedName, byte[] bytes) {
 		if (!init) {
@@ -115,4 +119,8 @@ public byte[] transform(String name, String transformedName, byte[] bytes) {
 		}
 		return postSrgTransformationHook(name, transformedName, bytes);
 	}
+
+	private static class LazyModPatcherHolder {
+		private static final ModPatcher INSTANCE = new ModPatcher();
+	}
 }
diff --git a/...llar/modpatcher/ModPatcherSetupClass.java → ...me/nallar/modpatcher/ModPatcherSetup.java b/...llar/modpatcher/ModPatcherSetupClass.java → ...me/nallar/modpatcher/ModPatcherSetup.java
@@ -6,10 +6,11 @@
 import java.util.*;
 
 /**
- * Return "me.nallar.modpatcher.ModPatcherSetupClass" in your IFMLLoadingPlugin's getSetupClass
- * if you are using ModPatcher in your own core mod
+ * Set as the setup class for your CoreMod to set up ModPatcher
+ *
+ * <pre><code>@Override public String getSetupClass() { return ModPatcher.getSetupClass(); }</code></pre>
  */
-public class ModPatcherSetupClass implements IFMLCallHook {
+public class ModPatcherSetup implements IFMLCallHook {
 	private static boolean modPatcherInitialised = false;
 
 	@Override
@@ -23,8 +24,10 @@ private void initialised(LaunchClassLoader classLoader) {
 		}
 		modPatcherInitialised = true;
 
+		classLoader.addClassLoaderExclusion("me.nallar.modpatcher");
+		classLoader.addClassLoaderExclusion("javassist");
 		LaunchClassLoaderUtil.instance = classLoader;
-		LaunchClassLoaderUtil.addTransformer(new ModPatcher());
+		LaunchClassLoaderUtil.addTransformer(ModPatcher.getInstance());
 	}
 
 	@Override