From 0a8a535e2c409ef8f7ae7d4d25de0d5026bd131b Mon Sep 17 00:00:00 2001 From: Lex Manos Date: Sun, 15 Feb 2015 17:30:56 -0800 Subject: [PATCH] Quiet ClassPatchManager debug spam by default. Reenable using -Dfml.debugClassPatchManager=true. --- .../fml/common/patcher/ClassPatchManager.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/fml/src/main/java/net/minecraftforge/fml/common/patcher/ClassPatchManager.java b/fml/src/main/java/net/minecraftforge/fml/common/patcher/ClassPatchManager.java index 353eb0c38d..48b2797406 100644 --- a/fml/src/main/java/net/minecraftforge/fml/common/patcher/ClassPatchManager.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/patcher/ClassPatchManager.java @@ -36,6 +36,7 @@ public class ClassPatchManager { public static final ClassPatchManager INSTANCE = new ClassPatchManager(); public static final boolean dumpPatched = Boolean.parseBoolean(System.getProperty("fml.dumpPatchedClasses", "false")); + public static final boolean DEBUG = Boolean.parseBoolean(System.getProperty("fml.debugClassPatchManager", "false")); private GDiffPatcher patcher = new GDiffPatcher(); private ListMultimap patches; @@ -51,7 +52,6 @@ public class ClassPatchManager { } } - public byte[] getPatchedResource(String name, String mappedName, LaunchClassLoader loader) throws IOException { byte[] rawClassBytes = loader.getClassBytes(name); @@ -73,7 +73,8 @@ public class ClassPatchManager { return inputData; } boolean ignoredError = false; - FMLRelaunchLog.fine("Runtime patching class %s (input size %d), found %d patch%s", mappedName, (inputData == null ? 0 : inputData.length), list.size(), list.size()!=1 ? "es" : ""); + if (DEBUG) + FMLRelaunchLog.fine("Runtime patching class %s (input size %d), found %d patch%s", mappedName, (inputData == null ? 0 : inputData.length), list.size(), list.size()!=1 ? "es" : ""); for (ClassPatch patch: list) { if (!patch.targetClassName.equals(mappedName) && !patch.sourceClassName.equals(name)) @@ -120,7 +121,7 @@ public class ClassPatchManager { } } } - if (!ignoredError) + if (!ignoredError && DEBUG) { FMLRelaunchLog.fine("Successfully applied runtime patches for %s (new size %d)", mappedName, inputData.length); } @@ -192,13 +193,15 @@ public class ClassPatchManager { } } while (true); FMLRelaunchLog.fine("Read %d binary patches", patches.size()); - FMLRelaunchLog.fine("Patch list :\n\t%s", Joiner.on("\t\n").join(patches.asMap().entrySet())); + if (DEBUG) + FMLRelaunchLog.fine("Patch list :\n\t%s", Joiner.on("\t\n").join(patches.asMap().entrySet())); patchedClasses.clear(); } private ClassPatch readPatch(JarEntry patchEntry, JarInputStream jis) { - FMLRelaunchLog.finer("Reading patch data from %s", patchEntry.getName()); + if (DEBUG) + FMLRelaunchLog.finer("Reading patch data from %s", patchEntry.getName()); ByteArrayDataInput input; try {