From 7c1cba29a03c79d7eb42c24ca355fcfbd6611ea4 Mon Sep 17 00:00:00 2001
From: liujiahua123123 <liujiahua123123@126.com>
Date: Sun, 11 Aug 2019 18:08:55 +0800
Subject: [PATCH] fix event

---
 .../main/java/net/mamoe/mirai/MiraiMain.java  |  4 ---
 .../java/net/mamoe/mirai/MiraiServer.java     | 35 +++++++++++++++----
 .../mamoe/mirai/event/MiraiEventManager.java  |  2 --
 .../mamoe/mirai/utils/LoggerTextFormat.java   | 25 +++++++++++++
 .../net/mamoe/mirai/utils/MiraiLogger.java    | 31 ++++++++++++++++
 5 files changed, 84 insertions(+), 13 deletions(-)
 create mode 100644 mirai-core/src/main/java/net/mamoe/mirai/utils/LoggerTextFormat.java
 create mode 100644 mirai-core/src/main/java/net/mamoe/mirai/utils/MiraiLogger.java

diff --git a/mirai-core/src/main/java/net/mamoe/mirai/MiraiMain.java b/mirai-core/src/main/java/net/mamoe/mirai/MiraiMain.java
index 7b3531266..6f0a66781 100644
--- a/mirai-core/src/main/java/net/mamoe/mirai/MiraiMain.java
+++ b/mirai-core/src/main/java/net/mamoe/mirai/MiraiMain.java
@@ -14,9 +14,5 @@ public final class MiraiMain {
         Runtime.getRuntime().addShutdownHook(new Thread(() -> {
             server.shutdown();
         }));
-        server.getTaskManager().repeatingTask(() -> {
-            System.out.println(3);
-        },1000,5);
-
     }
 }
diff --git a/mirai-core/src/main/java/net/mamoe/mirai/MiraiServer.java b/mirai-core/src/main/java/net/mamoe/mirai/MiraiServer.java
index d22e93eb8..36c692a9e 100644
--- a/mirai-core/src/main/java/net/mamoe/mirai/MiraiServer.java
+++ b/mirai-core/src/main/java/net/mamoe/mirai/MiraiServer.java
@@ -6,20 +6,39 @@ import net.mamoe.mirai.event.events.server.ServerDisableEvent;
 import net.mamoe.mirai.event.events.server.ServerEnableEvent;
 import net.mamoe.mirai.network.Network;
 import net.mamoe.mirai.task.MiraiTaskManager;
+import net.mamoe.mirai.utils.LoggerTextFormat;
+import net.mamoe.mirai.utils.MiraiLogger;
 
+import java.awt.*;
+import java.io.File;
 import java.io.IOException;
+import java.nio.file.Path;
 
 public class MiraiServer {
     @Getter
     private static MiraiServer instance;
 
+    @Getter //mirai version
+    private final static String miraiVersion = "1.0.0";
+
+    @Getter //is running under UNIX
+    private boolean unix;
+
+    @Getter//file path
+    private File parentFolder;
+
+    @Getter
+    MiraiEventManager eventManager;
+    @Getter
+    MiraiTaskManager taskManager;
+    @Getter
+    MiraiLogger logger;
+
+
     protected MiraiServer(){
         instance = this;
-
         this.onLoad();
-
         Thread.yield();
-
         this.onEnable();
     }
 
@@ -32,17 +51,19 @@ public class MiraiServer {
     }
 
 
-    @Getter
-    MiraiEventManager eventManager;
-    @Getter
-    MiraiTaskManager taskManager;
 
 
     private void onLoad(){
+        this.parentFolder = new File(System.getProperty("user.dir"));
+        this.unix = !System.getProperties().getProperty("os.name").toUpperCase().contains("WINDOWS");
 
+        this.logger = MiraiLogger.getInstance();
         this.eventManager = MiraiEventManager.getInstance();
         this.taskManager = MiraiTaskManager.getInstance();
 
+        this.getLogger().log(LoggerTextFormat.SKY_BLUE + "About to run Mirai" + MiraiServer.getMiraiVersion() + " under " + (isUnix()?"unix":"windows") );
+        this.getLogger().log("Loading data under " + this.parentFolder);
+
         /*
         try {
             Network.start(Network.getAvailablePort());
diff --git a/mirai-core/src/main/java/net/mamoe/mirai/event/MiraiEventManager.java b/mirai-core/src/main/java/net/mamoe/mirai/event/MiraiEventManager.java
index d015cce7e..3944e8c3b 100644
--- a/mirai-core/src/main/java/net/mamoe/mirai/event/MiraiEventManager.java
+++ b/mirai-core/src/main/java/net/mamoe/mirai/event/MiraiEventManager.java
@@ -78,9 +78,7 @@ public class MiraiEventManager {
 
     public void boardcastEvent(MiraiEvent event){
         hooksLock.lock();
-        System.out.println(hooks);
         if(hooks.containsKey(event.getClass())){
-            System.out.println(hooks.get(event.getClass()).size());
             hooks.put(event.getClass(),
                     hooks.get(event.getClass())
                     .stream()
diff --git a/mirai-core/src/main/java/net/mamoe/mirai/utils/LoggerTextFormat.java b/mirai-core/src/main/java/net/mamoe/mirai/utils/LoggerTextFormat.java
new file mode 100644
index 000000000..32626ed75
--- /dev/null
+++ b/mirai-core/src/main/java/net/mamoe/mirai/utils/LoggerTextFormat.java
@@ -0,0 +1,25 @@
+package net.mamoe.mirai.utils;
+
+import net.mamoe.mirai.MiraiServer;
+
+public enum LoggerTextFormat {
+    RED("\033[31m"),
+    GREEN("\033[32m"),
+    YELLOW("\033[33m"),
+    BLUE("\033[34m"),
+    SKY_BLUE("\033[36m"),
+    RESET("\33[0m");
+    private String format;
+
+    LoggerTextFormat(String format) {
+        this.format = format;
+    }
+
+    @Override
+    public String toString() {
+        if(MiraiServer.getInstance().isUnix()){
+            return format;
+        }
+        return "";
+    }
+}
diff --git a/mirai-core/src/main/java/net/mamoe/mirai/utils/MiraiLogger.java b/mirai-core/src/main/java/net/mamoe/mirai/utils/MiraiLogger.java
new file mode 100644
index 000000000..72ec19b6b
--- /dev/null
+++ b/mirai-core/src/main/java/net/mamoe/mirai/utils/MiraiLogger.java
@@ -0,0 +1,31 @@
+package net.mamoe.mirai.utils;
+
+import net.mamoe.mirai.MiraiServer;
+import net.mamoe.mirai.task.MiraiTaskManager;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class MiraiLogger {
+
+    private static MiraiLogger instance;
+
+    public static MiraiLogger getInstance(){
+        if(MiraiLogger.instance == null){
+            MiraiLogger.instance = new MiraiLogger();
+        }
+        return MiraiLogger.instance;
+    }
+
+
+    public void log(Object o){
+        this.log(o.toString());
+    }
+
+    public void log(String s){
+        System.out.println("[" + new SimpleDateFormat("MM-dd HH:mm:ss").format(new Date()) + "] Mirai: " + s + LoggerTextFormat.RESET);
+    }
+
+}
+
+