From a67752ac767d62342d724e8549796d83a978f4b4 Mon Sep 17 00:00:00 2001
From: kiritow <1362050620@qq.com>
Date: Thu, 4 Jan 2018 13:38:11 +0800
Subject: [PATCH] Update event library

---
 libevent.lua | 144 +++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 141 insertions(+), 3 deletions(-)

diff --git a/libevent.lua b/libevent.lua
index f436ff8..79fe630 100644
--- a/libevent.lua
+++ b/libevent.lua
@@ -1,10 +1,148 @@
 require("checkarg")
 local event=require("event")
 
+local internal_evtb={}
+
+local function canEventTranslate(name)
+    for k,v in pairs(internal_evtb) do 
+        if(k==name) then 
+            return true
+        end
+    end 
+    return false
+end
+
+local function doEventCustomTranslate(raw_event,t)
+    local name=raw_event[1]
+    local call=internal_evtb[name]
+    call(raw_event,t)
+end
+
+local function doEventTranslate(raw_event)
+    local t={}
+    local nop=0
+
+    local name=raw_event[1]
+    local a=raw_event[2]
+    local b=raw_event[3]
+    local c=raw_event[4]
+    local d=raw_event[5]
+    local e=raw_event[6]
+    local f=raw_event[7]
+    local g=raw_event[8]
+
+    t["event"]=name
+
+    if(name=="component_added" or name=="component_removed") then
+        t["address"]=a
+        t["componentType"]=b
+    elseif(name=="component_available" or name=="component_unavailable") then
+        t["componentType"]=a
+    elseif(name=="term_available" or name=="term_unavailable") then
+        nop=nop+1
+    elseif(name=="screen_resized") then 
+        t["screenAddress"]=a
+        t["newWidth"]=b
+        t["newHeight"]=c
+    elseif(name=="touch" or name=="drag" or name=="drop") then
+        t["screenAddress"]=a
+        t["x"]=b
+        t["y"]=c
+        t["button"]=d
+        t["playerName"]=e
+    elseif(name=="scroll") then
+        t["screenAddress"]=a
+        t["x"]=b
+        t["y"]=c
+        t["direction"]=d
+        t["playerName"]=e
+    elseif(name=="walk") then 
+        t["screenAddress"]=a
+        t["x"]=b
+        t["y"]=c
+        t["playerName"]=d
+    elseif(name=="key_down" or name=="key_up") then
+        t["keyboardAddress"]=a
+        t["char"]=b
+        t["code"]=c
+        t["playerName"]=d
+    elseif(name=="clipboard") then
+        t["keyboardAddress"]=a
+        t["value"]=b
+        t["playerName"]=c
+    elseif(name=="redstone_changed") then
+        t["address"]=a
+        t["side"]=b
+        t["oldValue"]=c
+        t["newValue"]=d
+    elseif(name=="motion") then 
+        t["address"]=a
+        t["relativeX"]=b
+        t["relativeY"]=c
+        t["relativeZ"]=d
+        t["entityName"]=e
+    elseif(name=="modem_message") then --- Special
+        t["receiverAddress"]=a
+        t["senderAddress"]=b
+        t["port"]=c
+        t["distance"]=d
+        local dtb={}
+        for i=6,raw_event.n,1 do 
+            table.insert(dtb,raw_event[i])
+        end
+        t["data"]=dtb
+    elseif(name=="inventory_changed") then 
+        t["slot"]=a
+    elseif(name=="bus_message") then
+        t["protocolId"]=a
+        t["senderAddress"]=b
+        t["targetAddress"]=c
+        t["data"]=d
+        t["metadata"]=e
+    elseif(name=="minecraft") then
+        t["detectorAddress"]=a
+        t["minecartType"]=b
+        t["minecartName"]=c
+        t["primaryColor"]=d
+        t["secondaryColor"]=e
+        t["destination"]=f
+        t["ownerName"]=g
+    elseif(name=="aspect_changed") then
+        t["address"]=a
+        t["signalName"]=b
+        t["signalValue"]=c
+    else -- Unknown Event
+        if(canEventTranslate(name)) then -- Try Translate
+            doEventCustomTranslate(raw_event,t)
+        else -- Cannot Translate
+            return table.unpack(raw_event)
+        end
+    end
+
+    return t
+end
+
+function SetEventTranslator(event_name,callback)
+    checkstring(event_name)
+    if(callback~=nil) then 
+        checkfunction(callback) 
+    end 
+    internal_evtb[event_name]=callback
+end
+
 function AddEventListener(EventName,CallbackFunction)
     checkstring(EventName)
     checkfunction(CallbackFunction)
-    return event.listen(EventName,CallbackFunction)
+    return event.listen(EventName,
+        function(...)
+            local raw_event=table.pack(...)
+            local rt=table.pack(doEventTranslate(raw_event))
+            if(type(rt[1])=="table") then
+                return CallbackFunction(rt[1])
+            else
+                return CallbackFunction(table.unpack(rt))
+            end
+        end)
 end
 
 function RemoveEventListener(ListenerID)
@@ -14,13 +152,13 @@ end
 
 function WaitEvent(EventName)
     checkstring(EventName)
-    return event.pull(EventName)
+    return doEventTranslate(table.pack(event.pull(EventName)))
 end
 
 function WaitEventFor(EventName,TimeOut)
     checkstring(EventName)
     checknumber(TimeOut)
-    return event.pull(TimeOut,EventName)
+    return doEventTranslate(table.pack(event.pull(TimeOut,EventName)))
 end
 
 function PushEvent(EventName,...)