diff --git a/src/main/java/noppes/npcs/LogWriter.java b/src/main/java/noppes/npcs/LogWriter.java index 6a0911139..53167bcbd 100644 --- a/src/main/java/noppes/npcs/LogWriter.java +++ b/src/main/java/noppes/npcs/LogWriter.java @@ -22,6 +22,7 @@ import java.util.logging.StreamHandler; public class LogWriter { private final static String name = "CustomNPCs"; + private final static String nameLog = "CustomNPCLog"; private final static Logger logger = Logger.getLogger(name); private final static WeakHashMap InitCacheMap = new WeakHashMap(); @@ -65,8 +66,11 @@ public class LogWriter { handler = new StreamHandler(new FileOutputStream(file), new Formatter() { @Override public String format(LogRecord record) { - StackTraceElement element = Thread.currentThread().getStackTrace()[8]; - String line = "[" + element.getClassName() + ":" + element.getLineNumber() + "] "; + String line = ""; + if (record.getLevel() != NPCLogLevel.CNPCLog){ + StackTraceElement element = Thread.currentThread().getStackTrace()[8]; + line = "[" + element.getClassName() + ":" + element.getLineNumber() + "] "; + } String time = "[" + dateformat.format(new Date(record.getMillis())) + "][" + record.getLevel() + "]" + line; if(record.getThrown() != null){ StringWriter sw = new StringWriter(); @@ -82,9 +86,8 @@ public class LogWriter { logger.setUseParentHandlers(false); Handler consoleHandler = new ConsoleHandler(); consoleHandler.setFormatter(handler.getFormatter()); - consoleHandler.setLevel(Level.FINEST); + consoleHandler.setLevel(Level.ALL); logger.addHandler(consoleHandler); - logger.setLevel(Level.ALL); info(new Date().toString()); } catch (SecurityException e) { @@ -145,10 +148,7 @@ public class LogWriter { long millisecSinceLast = TimeUnit.MILLISECONDS.toMillis(stamp.recentDate.getTime() - stamp.makeDate.getTime()); double frequency = (float)CustomNpcs.ScriptFrequency / 60; - - - - // Reset Log if 3 Minutes Pass + // Reset Log if 2 Minutes Pass if (secondsSinceFirst > 120) { LogWriter.script(message); stamp.counter = 1; @@ -178,7 +178,7 @@ public class LogWriter { } public static void script(Object msg) { - logger.log(Level.ALL, msg.toString()); + logger.log(NPCLogLevel.CNPCLog, msg.toString()); handler.flush(); } diff --git a/src/main/java/noppes/npcs/NPCLogLevel.java b/src/main/java/noppes/npcs/NPCLogLevel.java new file mode 100644 index 000000000..c5c0ee159 --- /dev/null +++ b/src/main/java/noppes/npcs/NPCLogLevel.java @@ -0,0 +1,11 @@ +package noppes.npcs; + +import java.util.logging.Level; + +class NPCLogLevel extends Level { + public static final Level CNPCLog = new NPCLogLevel("CNPC", 0); + + public NPCLogLevel(String name, int value) { + super(name, value); + } +} \ No newline at end of file diff --git a/src/main/java/noppes/npcs/controllers/data/DataScript.java b/src/main/java/noppes/npcs/controllers/data/DataScript.java index c4a3bb652..94015eaaf 100644 --- a/src/main/java/noppes/npcs/controllers/data/DataScript.java +++ b/src/main/java/noppes/npcs/controllers/data/DataScript.java @@ -137,7 +137,11 @@ public class DataScript implements IScriptHandler { script.engine.put(obs[i].toString(), ob); } if(CustomNpcs.ScriptLogging && FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER){ - LogWriter.postScriptLog(npc.field_110179_h, type, String.format("[%s] NPC %s (%s, %s, %s) | Objects: %s", ((String)type.function).toUpperCase(), npc.display.name, (int)npc.posX, (int)npc.posY, (int)npc.posZ, Arrays.toString(obs))); + if(obs.length > 1 && obs[1] == null){ + LogWriter.postScriptLog(npc.field_110179_h, type, String.format("[%s] NPC %s (%s, %s, %s)", ((String)type.function).toUpperCase(), npc.display.name, (int)npc.posX, (int)npc.posY, (int)npc.posZ)); + } else { + LogWriter.postScriptLog(npc.field_110179_h, type, String.format("[%s] NPC %s (%s, %s, %s) | Objects: %s", ((String)type.function).toUpperCase(), npc.display.name, (int)npc.posX, (int)npc.posY, (int)npc.posZ, Arrays.toString(obs))); + } } return callScript(script, event); }