ModPatcher is now a lazy-loaded singleton

MinimallyCorrect · Jan 5, 2016 · 507a51b · 507a51b
1 parent 0eba8dd
commit 507a51b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 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";
@@ -115,4 +115,12 @@ public byte[] transform(String name, String transformedName, byte[] bytes) {
 		}
 		return postSrgTransformationHook(name, transformedName, bytes);
 	}
+
+	public static IClassTransformer getInstance() {
+		return LazyModPatcherHolder.INSTANCE;
+	}
+
+	private static class LazyModPatcherHolder {
+		private static final ModPatcher INSTANCE = new ModPatcher();
+	}
 }
diff --git a/src/main/java/me/nallar/modpatcher/ModPatcherSetupClass.java b/src/main/java/me/nallar/modpatcher/ModPatcherSetupClass.java
@@ -6,8 +6,9 @@
 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 {
 	private static boolean modPatcherInitialised = false;
@@ -24,7 +25,7 @@ private void initialised(LaunchClassLoader classLoader) {
 		modPatcherInitialised = true;
 
 		LaunchClassLoaderUtil.instance = classLoader;
-		LaunchClassLoaderUtil.addTransformer(new ModPatcher());
+		LaunchClassLoaderUtil.addTransformer(ModPatcher.getInstance());
 	}
 
 	@Override