From 7f7ea6ac9717404d5ffb1bfc474c58c609801936 Mon Sep 17 00:00:00 2001
From: MrZ_26 <1046101471@qq.com>
Date: Sun, 6 Nov 2022 20:47:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E4=BB=A3=E7=A0=81=EF=BC=8C?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8A=A0=E8=BD=BD=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.lua | 59 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 30 insertions(+), 29 deletions(-)

diff --git a/main.lua b/main.lua
index 344287dd..ffc7a03e 100644
--- a/main.lua
+++ b/main.lua
@@ -72,8 +72,6 @@ WIDGET.setOnChange(function()
     end
 end)
 
-table.insert(_LOADTIMELIST_,("Load Zframework: %.3fs"):format(TIME()-_LOADTIME_))
-
 -- Create shortcuts
 setFont=FONT.set
 getFont=FONT.get
@@ -98,10 +96,6 @@ for _,v in next,{'conf','record','replay','cache','lib'} do
     end
 end
 
-CHAR=require'parts.char'
-require'parts.gameTables'
-require'parts.gameFuncs'
-
 -- Load shader files from SOURCE ONLY
 SHADER={}
 for _,v in next,fs.getDirectoryItems('parts/shaders') do
@@ -111,6 +105,11 @@ for _,v in next,fs.getDirectoryItems('parts/shaders') do
     end
 end
 
+-- Load modules
+CHAR=require'parts.char'
+require'parts.gameTables'
+require'parts.gameFuncs'
+
 THEME=      require'parts.theme'
 LINE=       require'parts.line'
 DATA=       require'parts.data'
@@ -121,7 +120,7 @@ USERS=      require'parts.users'
 NET=        require'parts.net'
 VK=         require'parts.virtualKey'
 BOT=        require'parts.bot'
-RSlist=     require'parts.RSlist'DSCP=RSlist.TRS.centerPos
+RSlist=     require'parts.RSlist'; DSCP=RSlist.TRS.centerPos
 PLY=        require'parts.player'
 NETPLY=     require'parts.netPlayer'
 MODES=      require'parts.modes'
@@ -132,9 +131,28 @@ setmetatable(TEXTURE,{__index=function(self,k)
     return self[k]
 end})
 
-table.insert(_LOADTIMELIST_,("Load Parts: %.3fs"):format(TIME()-_LOADTIME_))
+-- Load mode files
+for i=1,#MODES do
+    local m=MODES[i]-- Mode template
+    if FILE.isSafe('parts/modes/'..m.name) then
+        TABLE.complete(require('parts.modes.'..m.name),MODES[i])
+        MODES[m.name],MODES[i]=MODES[i]
+    end
+end
+for _,v in next,fs.getDirectoryItems('parts/modes') do
+    if FILE.isSafe('parts/modes/'..v) and not MODES[v:sub(1,-5)] then
+        local M={name=v:sub(1,-5)}
+        local modeData=require('parts.modes.'..M.name)
+        if modeData.env then
+            TABLE.complete(modeData,M)
+            MODES[M.name]=M
+        end
+    end
+end
 
--- Init Zframework
+table.insert(_LOADTIMELIST_,("Load Modules: %.3fs"):format(TIME()-_LOADTIME_))
+
+-- Initialize Zframework
 do-- Z.setCursor
     local normImg=GC.DO{16,16,
         {'fCirc',8,8,4},
@@ -239,25 +257,6 @@ Z.setOnQuit(function()
     destroyPlayers()
 end)
 
--- Load mode files
-for i=1,#MODES do
-    local m=MODES[i]-- Mode template
-    if FILE.isSafe('parts/modes/'..m.name) then
-        TABLE.complete(require('parts.modes.'..m.name),MODES[i])
-        MODES[m.name],MODES[i]=MODES[i]
-    end
-end
-for _,v in next,fs.getDirectoryItems('parts/modes') do
-    if FILE.isSafe('parts/modes/'..v) and not MODES[v:sub(1,-5)] then
-        local M={name=v:sub(1,-5)}
-        local modeData=require('parts.modes.'..M.name)
-        if modeData.env then
-            TABLE.complete(modeData,M)
-            MODES[M.name]=M
-        end
-    end
-end
-
 -- Initialize image libs
 IMG.init{
     lock='media/image/mess/lock.png',
@@ -366,6 +365,8 @@ VOC.init{
     'welcome',
 }
 
+table.insert(_LOADTIMELIST_,("Initialize Modules: %.3fs"):format(TIME()-_LOADTIME_))
+
 -- Load settings and statistics
 if
     not (
@@ -610,7 +611,7 @@ WS.switchHost('cafuuchino1.3322.org','10026','/techmino/ws/v1')
 HTTP.setHost("cafuuchino1.3322.org:10026")
 HTTP.setThreadCount(1)
 
-table.insert(_LOADTIMELIST_,("Initialize Data: %.3fs"):format(TIME()-_LOADTIME_))
+table.insert(_LOADTIMELIST_,("Load Resources: %.3fs"):format(TIME()-_LOADTIME_))
 
 for i=1,#_LOADTIMELIST_ do LOG(_LOADTIMELIST_[i]) end