From e7d5a64b7637994eb1be0a4c924041330391154d Mon Sep 17 00:00:00 2001
From: Rintim <rintim@foxmail.com>
Date: Sun, 10 Sep 2023 21:06:46 +0800
Subject: [PATCH 1/3] async.

---
 game/game.js | 52 +++++++++++++++++++++++++++++-----------------------
 1 file changed, 29 insertions(+), 23 deletions(-)

diff --git a/game/game.js b/game/game.js
index 8441b63d2..1d344f67b 100644
--- a/game/game.js
+++ b/game/game.js
@@ -8415,13 +8415,16 @@
 						styleToLoad--;
 						if(styleToLoad==0){
 							if(extensionlist.length&&(lib.config.mode!='connect'||show_splash)){
-								var extToLoad=extensionlist.length;
-								var extLoaded=function(){
-									extToLoad--;
+								_status.extensionLoading=[];
+								let extToLoad=extensionlist.length;
+								const extLoaded=gnc.async(function*(){
+									--extToLoad;
 									if(extToLoad==0){
+										yield Promise.allSettled(_status.extensionLoading);
+										delete _status.extensionLoading;
 										loadPack();
 									}
-								}
+								});
 								//读取扩展
 								var alerted=false;
 								for(var i=0;i<extensionlist.length;i++){
@@ -9695,7 +9698,7 @@
 							try{
 								_status.extension=lib.extensions[i][0];
 								_status.evaluatingExtension=lib.extensions[i][3];
-								if (typeof lib.extensions[i][1]=="function") lib.extensions[i][1](lib.extensions[i][2],lib.extensions[i][4]);
+								if (typeof lib.extensions[i][1]=="function") yield lib.extensions[i][1](lib.extensions[i][2],lib.extensions[i][4]);
 								if(lib.extensions[i][4]){
 									if(lib.extensions[i][4].character){
 										for(var j in lib.extensions[i][4].character.character){
@@ -33448,27 +33451,30 @@
 			}
 		},
 		import:function(type,content){
-			if(type=='extension'){
-				//Anti-Cheat system updated, no need to work here
-				//var backup_onload=lib.init.onload;
-				game.loadExtension(content);
-				//lib.init.onload=backup_onload;
-			}
-			else{
-				if(!lib.imported[type]){
-					lib.imported[type]={};
+			const asyncFn=gnc.async(function*(){
+				if(type=='extension'){
+					yield game.loadExtension(content);
 				}
-				var content2=content(lib,game,ui,get,ai,_status);
-				if(content2.name){
-					lib.imported[type][content2.name]=content2;
-					delete content2.name;
+				else{
+					if(!lib.imported[type]){
+						lib.imported[type]={};
+					}
+					var content2=yield content(lib,game,ui,get,ai,_status);
+					if(content2.name){
+						lib.imported[type][content2.name]=content2;
+						delete content2.name;
+					}
 				}
-			}
+			});
+			if(typeof _status.extensionLoading=="undefined")_status.extensionLoading=[];
+			const promise=asyncFn();
+			_status.extensionLoading.add(promise);
+			return promise;
 		},
-		loadExtension:function(obj){
+		loadExtension:gnc.async(function*(obj){
 			var noeval=false;
 			if(typeof obj=='function'){
-				obj=obj(lib,game,ui,get,ai,_status);
+				obj=yield obj(lib,game,ui,get,ai,_status);
 				noeval=true;
 			}
 			lib.extensionMenu['extension_'+obj.name]={
@@ -33586,7 +33592,7 @@
 						}
 						if(obj.precontent){
 							_status.extension=obj.name;
-							obj.precontent(cfg);
+							yield obj.precontent(cfg);
 							delete _status.extension;
 						}
 						if(obj.content){
@@ -33601,7 +33607,7 @@
 			else{
 				game.importedPack=obj;
 			}
-		},
+		}),
 		createDir:function(dir,success,error){
 			var nullFC=function(){};
 			success=success||nullFC;

From 7847ac849840a6373a58aba15ad224eeedaf5fd9 Mon Sep 17 00:00:00 2001
From: Rintim <rintim@foxmail.com>
Date: Sun, 10 Sep 2023 21:19:48 +0800
Subject: [PATCH 2/3] async fix.

---
 game/game.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/game/game.js b/game/game.js
index 1d344f67b..11e1c67c1 100644
--- a/game/game.js
+++ b/game/game.js
@@ -8411,8 +8411,8 @@
 						throw e;
 					});
 					var styleToLoad=6;
-					var styleLoaded=function(){
-						styleToLoad--;
+					var styleLoaded=gnc.async(function*(){
+						--styleToLoad;
 						if(styleToLoad==0){
 							if(extensionlist.length&&(lib.config.mode!='connect'||show_splash)){
 								_status.extensionLoading=[];
@@ -8430,8 +8430,10 @@
 								for(var i=0;i<extensionlist.length;i++){
 									if(window.bannedExtensions.contains(extensionlist[i])){
 										alerted=true;
-										extToLoad--;
+										--extToLoad;
 										if(extToLoad==0){
+											yield Promise.allSettled(_status.extensionLoading);
+											delete _status.extensionLoading;
 											loadPack();
 										}
 										continue;
@@ -8439,8 +8441,10 @@
 									lib.init.js(lib.assetURL+'extension/'+extensionlist[i],'extension',extLoaded,(function(i){
 										return function(){
 											game.removeExtension(i);
-											extToLoad--;
+											--extToLoad;
 											if(extToLoad==0){
+												yield Promise.allSettled(_status.extensionLoading);
+												delete _status.extensionLoading;
 												loadPack();
 											}
 										}
@@ -8451,7 +8455,7 @@
 								loadPack();
 							}
 						}
-					};
+					});
 					if(lib.config.layout=='default'){
 						lib.config.layout='mobile';
 					}

From 7d130339f2def00d84bfd6f6641d4cd91e9ec47f Mon Sep 17 00:00:00 2001
From: Rintim <rintim@foxmail.com>
Date: Sun, 10 Sep 2023 21:21:16 +0800
Subject: [PATCH 3/3] bugfix.

---
 game/game.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/game/game.js b/game/game.js
index 11e1c67c1..3182ccabf 100644
--- a/game/game.js
+++ b/game/game.js
@@ -8439,7 +8439,7 @@
 										continue;
 									}
 									lib.init.js(lib.assetURL+'extension/'+extensionlist[i],'extension',extLoaded,(function(i){
-										return function(){
+										return gnc.async(function*(){
 											game.removeExtension(i);
 											--extToLoad;
 											if(extToLoad==0){
@@ -8447,7 +8447,7 @@
 												delete _status.extensionLoading;
 												loadPack();
 											}
-										}
+										});
 									}(extensionlist[i])));
 								}
 							}