minor refactoring and logging output changes

Mumfrey
1 parent b3097a72
Showing 5 changed files with 60 additions and 19 deletions
java/client/com/mumfrey/liteloader/client/gui/GuiPanelLiteLoaderLog.java
java/common/com/mumfrey/liteloader/core/LiteLoaderEnumerator.java
java/common/com/mumfrey/liteloader/core/api/EnumeratorModuleFolder.java
java/common/com/mumfrey/liteloader/transformers/event/EventInjectionTransformer.java
java/common/com/mumfrey/liteloader/util/log/LiteLoaderLogger.java
@@ -23,7 +23,7 @@ import com.mumfrey.liteloader.util.net.LiteLoaderLogUpload;
  */
 class GuiPanelLiteLoaderLog extends GuiPanel implements ScrollPanelContent
 {
-	private static boolean useNativeRes = false;
+	private static boolean useNativeRes = true;
  
 	/**
 	 * Scroll pane
@@ -226,7 +226,7 @@ class GuiPanelLiteLoaderLog extends GuiPanel implements ScrollPanelContent
 		{
 			if (yPos > scrollAmount - 10 && yPos <= scrollAmount + height)
 			{
-				this.mc.fontRendererObj.drawString(logLine, 0, yPos, this.getMessageColour(logLine.toLowerCase()));
+				this.mc.fontRendererObj.drawString(logLine, 0, yPos, this.getMessageColour(logLine.toLowerCase().substring(11)));
 			}
 			yPos += 10;
 		}
@@ -259,6 +259,14 @@ class GuiPanelLiteLoaderLog extends GuiPanel implements ScrollPanelContent
 		if (logLine.startsWith("calling late")) return 0x00AAAA;
 		if (logLine.startsWith("dependency check")) return 0xFFAA00;
 		if (logLine.startsWith("dependency")) return 0xFF5500;
+		if (logLine.startsWith("mod name collision")) return 0xAA0000;
+		if (logLine.startsWith("registering discovery module")) return 0x55FF55;
+		if (logLine.startsWith("registering interface provider")) return 0xFFAA00;
+		if (logLine.startsWith("mod file '")) return 0xFFAA00;
+		if (logLine.startsWith("classtransformer '")) return 0x5555FF;
+		if (logLine.startsWith("tweakClass '")) return 0x5555FF;
+		if (logLine.startsWith("baking listener list")) return 0x00AAAA;
+		if (logLine.startsWith("generating new event handler")) return 0xFFFF55;
  
 		return 0xCCCCCC;
 	}
@@ -453,15 +453,28 @@ public class LiteLoaderEnumerator implements LoaderEnumerator
  
 		if (container != null)
 		{
-			if (container.isEnabled(this.environment) && this.checkDependencies(container) && this.checkAPIRequirements(container))
+			if (!container.isEnabled(this.environment))
 			{
-				this.registerEnabledContainer(container);
+				LiteLoaderLogger.info("Container %s is disabled", container.getLocation());
+				this.registerDisabledContainer(container);
+				return false;
 			}
-			else
+			
+			if (!this.checkDependencies(container))
 			{
+				LiteLoaderLogger.info("Container %s is missing one or more dependencies", container.getLocation());
 				this.registerDisabledContainer(container);
 				return false;
 			}
+				
+			if (!this.checkAPIRequirements(container))
+			{
+				LiteLoaderLogger.info("Container %s is missing one or more required APIs", container.getLocation());
+				this.registerDisabledContainer(container);
+				return false;
+			}
+
+			this.registerEnabledContainer(container);
 		}
  
 		return true;
@@ -36,20 +36,20 @@ public class EnumeratorModuleFolder implements FilenameFilter, EnumeratorModule
 	/**
 	 * Ordered sets used to sort mods by version/revision  
 	 */
-	private final Map<String, TreeSet<LoadableMod<File>>> versionOrderingSets = new HashMap<String, TreeSet<LoadableMod<File>>>();
+	protected final Map<String, TreeSet<LoadableMod<File>>> versionOrderingSets = new HashMap<String, TreeSet<LoadableMod<File>>>();
  
 	/**
 	 * Mods to add once init is completed
 	 */
-	private final List<LoadableMod<File>> loadableMods = new ArrayList<LoadableMod<File>>();
+	protected final List<LoadableMod<File>> loadableMods = new ArrayList<LoadableMod<File>>();
  
-	private LiteLoaderCoreAPI coreAPI;
+	protected LiteLoaderCoreAPI coreAPI;
  
-	private File directory;
+	protected File directory;
  
-	private boolean readZipFiles;
-	private boolean readJarFiles;
-	private boolean loadTweaks;
+	protected boolean readZipFiles;
+	protected boolean readJarFiles;
+	protected boolean loadTweaks;
  
 	/**
 	 * True if this is a general, unversioned folder and the enumerator should only add files which have valid version metadata
@@ -211,6 +211,16 @@ public class EnumeratorModuleFolder implements FilenameFilter, EnumeratorModule
 	}
  
 	/**
+	 * @param modFile
+	 * @return
+	 */
+	protected boolean isFileSupported(LoadableModFile modFile)
+	{
+		// Stub for subclasses
+		return LiteLoaderVersion.CURRENT.isVersionSupported(modFile.getTargetVersion());
+	}
+
+	/**
 	 * @param candidateFile
 	 * @param strVersion
 	 */
@@ -222,7 +232,7 @@ public class EnumeratorModuleFolder implements FilenameFilter, EnumeratorModule
 		{
 			// Only add the mod if the version matches, we add candidates to the versionOrderingSets in
 			// order to determine the most recent version available.
-			if (LiteLoaderVersion.CURRENT.isVersionSupported(modFile.getTargetVersion()))
+			if (this.isFileSupported(modFile))
 			{
 				if (!this.versionOrderingSets.containsKey(modFile.getName()))
 				{
@@ -261,7 +261,7 @@ public abstract class EventInjectionTransformer extends ClassTransformer
 		Event head = events.iterator().next();
 		MethodNode handler = head.inject(injectionPoint, cancellable, this.globalEventID);
  
-		LiteLoaderLogger.info("Injecting event %s with %d handlers in method %s in class %s", head.getName(), events.size(), method.name, classNode.name.replace('/', '.'));
+		LiteLoaderLogger.info("Injecting %s[x%d] in %s in %s", head.getName(), events.size(), method.name, getSimpleClassName(classNode));
  
 		for (Event event : events)
 		{
@@ -270,4 +270,11 @@ public abstract class EventInjectionTransformer extends ClassTransformer
  
 		this.globalEventID++;
 	}
+
+	private static String getSimpleClassName(ClassNode classNode)
+	{
+		String className = classNode.name.replace('/', '.');
+		int dotPos = className.lastIndexOf('.');
+		return dotPos == -1 ? className : className.substring(dotPos + 1);
+	}
 }
 \ No newline at end of file
@@ -4,6 +4,7 @@ import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.MissingFormatArgumentException;
@@ -51,11 +52,11 @@ public class LiteLoaderLogger extends AbstractAppender
 		synchronized (LiteLoaderLogger.logTail)
 		{
 			LiteLoaderLogger.logIndex++;
-			this.append(event.getMessage().getFormattedMessage());
+			this.append(event.getMillis(), event.getMessage().getFormattedMessage());
 			Throwable thrown = event.getThrown();
 			if (thrown != null)
 			{
-				this.append(String.format("\2474%s: \2476%s", thrown.getClass().getSimpleName(), thrown.getMessage()));
+				this.append(event.getMillis(), String.format("\2474%s: \2476%s", thrown.getClass().getSimpleName(), thrown.getMessage()));
 			}
 		}
 	}
@@ -63,16 +64,18 @@ public class LiteLoaderLogger extends AbstractAppender
 	/**
 	 * @param message
 	 */
-	private void append(String message)
+	private void append(long timestamp, String message)
 	{
+		String date = new java.text.SimpleDateFormat("[HH:mm:ss] ").format(new Date(timestamp));
+		
 		while (message.indexOf('\n') > -1)
 		{
 			int LF = message.indexOf('\n');
-			this.appendLine(message.substring(0, LF));
+			this.appendLine(date + message.substring(0, LF));
 			message = message.substring(LF + 1);
 		}
  
-		this.appendLine(message);
+		this.appendLine(date + message);
 	}
  
 	/**