Lots of bug fix && config update

ShrBox · ShrBox · commit 9291f736bd70 · 2021-12-26T14:37:03.000+08:00
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,2 +1,13 @@
 ## Bug Fix
-- Warp/Home GUI problem
+**Please replace all config file with the new config file**
+### LLTpa
+- Fixed bug when target player offline
+- Optimized message
+- Update Language Pack && Config
+
+### LLHelper
+- Optimized code
+- Update Language Pack
+
+## LLMoney
+- Update Language Pack
diff --git a/LLHelper/Helper.cpp b/LLHelper/Helper.cpp
@@ -6,27 +6,29 @@ std::unordered_map<string, string> CMDMAP, CMDSCHEDULE;
 int FAKE_SEED, MAX_CHAT_LEN;
 std::unordered_set<short> logItems, banItems;
 bool regABILITY, NO_EXPLOSION, EXP_PLAY, penderman, pfarm;
+std::string LANGUAGE = "en-us";
 Logger logger("Helper");
 
 void loadCfg() {
 	try {
 		CMDMAP.clear();
 		ConfigJReader jr("plugins\\LLHelper\\LLHelper.json");
-		jr.bind("CMDMAP", CMDMAP);
+		jr.bind("language", LANGUAGE);
+		jr.bind("command_map", CMDMAP);
 		jr.bind("timer", CMDSCHEDULE);
-		jr.bind("FAKE_SEED", FAKE_SEED, 114514);
-		jr.bind("NO_EXPLOSION", NO_EXPLOSION, false);
-		jr.bind("MAX_CHAT_LEN", MAX_CHAT_LEN, 96);
-		jr.bind("NoEndermanTakeBlock", penderman, true);
-		jr.bind("ProtectFarmBlock", pfarm, true);
+		jr.bind("fake_seed", FAKE_SEED, 114514);
+		jr.bind("no_explosion", NO_EXPLOSION, false);
+		jr.bind("max_chat_length", MAX_CHAT_LEN, 96);
+		jr.bind("no_enderman_take_block", penderman, true);
+		jr.bind("protect_farm_block", pfarm, true);
 		jr.bind("force_enable_ability", regABILITY, true);
 		std::vector<int> items;
 		logItems.clear();
 		banItems.clear();
-		jr.bind("logItems", items, {});
+		jr.bind("log_items", items, {});
 		for (auto i : items) logItems.insert(i);
 		items.clear();
-		jr.bind("banItems", items, {});
+		jr.bind("ban_items", items, {});
 		for (auto i : items) banItems.insert(i);
 	}
 	catch (string e) {
diff --git a/LLHelper/command.cpp b/LLHelper/command.cpp
@@ -15,6 +15,7 @@
 std::unique_ptr<KVDB> db;
 playerMap<string> ORIG_NAME;
 std::unordered_map<string, string> CNAME;
+extern std::string LANGUAGE;
 
 void loadCNAME() {
 	db = KVDB::create("plugins/LLHelper/data", false);
@@ -359,7 +360,7 @@ class ItemCommand : public Command {
 
 void RegisterCommands() {
 	loadCNAME();
-	Translation::load("plugins\\LLHelper\\langpack\\helper.json");
+	Translation::load("plugins\\LLHelper\\langpack\\" + LANGUAGE + ".json");
 	Event::RegCmdEvent::subscribe([](Event::RegCmdEvent e) {
 		TransferCommand::setup(e.mCommandRegistry);
 		HelperCommand::setup(e.mCommandRegistry);
diff --git a/LLMoney/LLMoney.cpp b/LLMoney/LLMoney.cpp
@@ -18,6 +18,7 @@
 using namespace RegisterCommandHelper;
 
 Logger logger("LLMoney");
+std::string LANGUAGE = "en-us";
 
 double MoneyFee;
 bool initDB();
@@ -311,12 +312,9 @@ class MoneySCommand : public Command {
 };
 
 void entry() {
-	std::filesystem::create_directory("plugins\\LLMoney");
-	std::filesystem::create_directory("plugins\\LLMoney\\langpack");
 	if (!initDB()) {
-		exit(1);
+		return;
 	}
-	Translation::load("plugins\\LLMoney\\langpack\\money.json");
 	Event::RegCmdEvent::subscribe([](const Event::RegCmdEvent& ev) {
 		MoneyCommand::setup(ev.mCommandRegistry);
 		MoneySCommand::setup(ev.mCommandRegistry);
@@ -325,6 +323,7 @@ void entry() {
 	try {
 		ConfigJReader jr("plugins\\LLMoney\\money.json");
 		int defmoney;
+		jr.bind("language", LANGUAGE);
 		jr.bind("def_money", defmoney, 0);
 		jr.bind("pay_tax", MoneyFee, .0);
 		DEF_MONEY = defmoney;
@@ -333,5 +332,6 @@ void entry() {
 		Logger("LLMoney").error("Json error: {}", e);
 		throw 0;
 	}
+	Translation::load("plugins\\LLMoney\\langpack\\" + LANGUAGE + ".json");
 	Logger("LLMoney").info("Loaded version: {}", _ver);
 }
diff --git a/LLtpa/Teleport.cpp b/LLtpa/Teleport.cpp
@@ -37,6 +37,7 @@ static unordered_map<string, Vec4> warps;
 
 static clock_t TPexpire = CLOCKS_PER_SEC * 10;
 static clock_t TPratelimit = CLOCKS_PER_SEC * 2;
+std::string LANGUAGE = "en-us";
 static int MAX_HOMES = 5;
 static int HOME_DISTANCE_LAND = 0;
 static bool BACK_ENABLED, SUICIDE_ENABLED, TPA_ENABLED, HOME_ENABLED;
@@ -104,31 +105,37 @@ bool DoCloseReq(decltype(reqs.begin()) rq, TPCloseReason res) {
 			break;
 		}
 	}
-	if (playerA && playerB) {
-		if (res == TPCloseReason::cancel) {
+	if (res == TPCloseReason::cancel) {
+		if (playerA)
+			playerA->sendText(tr("tpa.reason.cancel"));
+		if (playerB)
+			playerB->sendText(tr("tpa.reason.cancel"));
+		reqs.erase(rq);
+		return true;
+	}
+	if (res == TPCloseReason::accept) {
+		if (playerA && playerB) {
+			Vec4 AP{ rq->dir == A_B ? playerB : playerA };
+			AP.teleport(rq->dir == A_B ? playerA : playerB);
 			reqs.erase(rq);
+			playerA->sendTextPacket(tr("tpa.reason.accept"), TextType::RAW);
+			playerB->sendTextPacket(tr("tpa.reason.accept"), TextType::RAW);
 			return true;
 		}
-		if (res == TPCloseReason::accept) {
-			if (playerA && playerB) {
-				Vec4 AP{ rq->dir == A_B ? playerB : playerA };
-				AP.teleport(rq->dir == A_B ? playerA : playerB);
-				reqs.erase(rq);
-				playerA->sendTextPacket(tr("tpa.reason.accept"), TextType::RAW);
-				return true;
-			}
-			reqs.erase(rq);
-			return false;
-		}
-		playerA->sendTextPacket(res == TPCloseReason::deny ? tr("tpa.reason.deny") : tr("tpa.reason.timeout"), TextType::RAW);
-		playerB->sendTextPacket(res == TPCloseReason::deny ? tr("tpa.reason.deny") : tr("tpa.reason.timeout"), TextType::RAW);
+		// When tpa sender offline
+		if (playerB)
+			playerB->sendTextPacket(tr("tpa.reason.notonline"), TextType::RAW);
 		reqs.erase(rq);
-		return true;
-	}
-	else {
-		//no such player
+		return false;
 	}
+	if (playerA)
+		playerA->sendTextPacket(res == TPCloseReason::deny ? tr("tpa.reason.deny") : tr("tpa.reason.timeout"), TextType::RAW);
+	if (playerB)
+		playerB->sendTextPacket(res == TPCloseReason::deny ? tr("tpa.reason.deny") : tr("tpa.reason.timeout"), TextType::RAW);
+	reqs.erase(rq);
+	return true;
 }
+
 void DoMakeReq(ServerPlayer* _a, ServerPlayer* _b, direction dir) {
 	std::string a = _a->getRealName();
 	std::string b = _b->getRealName();
@@ -201,7 +208,7 @@ class TpaCommand : public Command {
 			switch (reqres) {
 			case TPFailReason::success:
 			{
-				DoMakeReq({ ori.getPlayer()}, t, dir);
+				DoMakeReq({ ori.getPlayer() }, t, dir);
 				return;
 			}
 			break;
@@ -265,7 +272,7 @@ class TpaCommand : public Command {
 				fm->addWidget({ GUILabel(guiLabel.c_str()) });
 				fm->addWidget({ GUIDropdown(guiDropdown1.c_str() ,{"to","here"}) });
 				fm->addWidget({ GUIDropdown(guiDropdown2.c_str() ,playerList()) });
-				sendForm(*ori.getPlayer(), FullFormBinder{fm,{[](ServerPlayer& P, FullFormBinder::DType data) {
+				sendForm(*ori.getPlayer(), FullFormBinder{ fm,{[](ServerPlayer& P, FullFormBinder::DType data) {
 					if (!data.set) return;
 						auto& [d1,d2] = data.val();
 						P.runcmd("tpa " + d2[0] + " " + d2[1]);
@@ -279,8 +286,8 @@ class TpaCommand : public Command {
 		using RegisterCommandHelper::makeMandatory;
 		using RegisterCommandHelper::makeOptional;
 		registry->registerCommand("tpa", "Teleport", CommandPermissionLevel::Any, { (CommandFlagValue)0 }, { (CommandFlagValue)0x80 });
-		registry->addEnum<direction>("TPAOP2", { {"to", direction::A_B}, {"here", direction::B_A}});
-		registry->addEnum<TpaCommand::TPAOP>("TPAOP", { {"ac", TPAOP::ac}, {"de", TPAOP::de}, {"cancel", TPAOP::cancel}, {"gui", TPAOP::gui}, {"toggle", TPAOP::toggle}});
+		registry->addEnum<direction>("TPAOP2", { {"to", direction::A_B}, {"here", direction::B_A} });
+		registry->addEnum<TpaCommand::TPAOP>("TPAOP", { {"ac", TPAOP::ac}, {"de", TPAOP::de}, {"cancel", TPAOP::cancel}, {"gui", TPAOP::gui}, {"toggle", TPAOP::toggle} });
 		registry->registerOverload<TpaCommand>("tpa", makeMandatory<CommandParameterDataType::ENUM>(&TpaCommand::dir, "direction", "TPAOP2", &TpaCommand::dir_isSet), makeMandatory(&TpaCommand::target, "player"));
 		registry->registerOverload<TpaCommand>("tpa", makeMandatory<CommandParameterDataType::ENUM>(&TpaCommand::op, "op", "TPAOP", &TpaCommand::tpaop_isSet));
 	}
@@ -372,7 +379,7 @@ class WarpCommand : public Command {
 		using RegisterCommandHelper::makeMandatory;
 		using RegisterCommandHelper::makeOptional;
 		registry->registerCommand("warp", "Teleport", CommandPermissionLevel::Any, { (CommandFlagValue)0 }, { (CommandFlagValue)0x80 });
-		registry->addEnum<WarpCommand::WARPOP>("WARPOP", { {"add", WARPOP::add}, {"del", WARPOP::del}, {"go", WARPOP::go}, {"gui", WARPOP::gui}, {"ls", WARPOP::ls}});
+		registry->addEnum<WarpCommand::WARPOP>("WARPOP", { {"add", WARPOP::add}, {"del", WARPOP::del}, {"go", WARPOP::go}, {"gui", WARPOP::gui}, {"ls", WARPOP::ls} });
 		registry->registerOverload<WarpCommand>("warp", makeMandatory<CommandParameterDataType::ENUM>(&WarpCommand::op, "op", "WARPOP"), makeOptional(&WarpCommand::val, "warp", &WarpCommand::val_isSet));
 	}
 };
@@ -513,14 +520,15 @@ class SuicideCommand : public Command {
 void loadCfg() {
 	try {
 		ConfigJReader jr("plugins\\LLtpa\\tpa.json");
+		jr.bind("language", LANGUAGE);
 		jr.bind("max_homes", MAX_HOMES, 5);
 		jr.bind("tpa_timeout", TPexpire, CLOCKS_PER_SEC * 20);
 		jr.bind("tpa_ratelimit", TPratelimit, CLOCKS_PER_SEC * 5);
 		jr.bind("home_land_distance", HOME_DISTANCE_LAND, -1);
-		jr.bind("BACK_ENABLED", BACK_ENABLED, true);
-		jr.bind("SUICIDE_ENABLED", SUICIDE_ENABLED, true);
-		jr.bind("TPA_ENABLED", TPA_ENABLED, true);
-		jr.bind("HOME_ENABLED", HOME_ENABLED, true);
+		jr.bind("back_enabled", BACK_ENABLED, true);
+		jr.bind("suicide_enabled", SUICIDE_ENABLED, true);
+		jr.bind("tpa_enabled", TPA_ENABLED, true);
+		jr.bind("home_enabled", HOME_ENABLED, true);
 	}
 	catch (string e) {
 		logger.error("JSON ERROR", e);
@@ -549,15 +557,12 @@ void init() {
 		rs.apply(warps);
 	}
 	loadCfg();
+	Translation::load("plugins/LLtpa/langpack/" + LANGUAGE + ".json");
 	reinitWARPGUI();
 }
 
 void tpa_entry() {
-	std::filesystem::create_directory("plugins\\LLtpa");
-	std::filesystem::create_directory("plugins\\LLtpa\\data");
-	std::filesystem::create_directory("plugins\\LLtpa\\langpack");
 	db = KVDB::create("plugins\\LLtpa\\data", true, 8);
-	Translation::load("plugins/LLtpa/langpack/tpa.json");
 	init();
 	schTask();
 	Event::RegCmdEvent::subscribe([](const Event::RegCmdEvent& e) {
@@ -572,7 +577,7 @@ void tpa_entry() {
 		return true;
 		});
 	if (BACK_ENABLED) {
-		Event::PlayerDieEvent::subscribe([](const Event::PlayerDieEvent&  ev) {
+		Event::PlayerDieEvent::subscribe([](const Event::PlayerDieEvent& ev) {
 			ServerPlayer* sp = (ServerPlayer*)ev.mPlayer;
 			deathPos[sp] = Vec4{ sp };
 			sp->sendTextPacket(tr("tpa.back.use"), TextType::RAW);
diff --git a/plugins/LLHelper/LLHelper.json b/plugins/LLHelper/LLHelper.json
@@ -1,18 +1,19 @@
 {
-    "CMDMAP": {
-        "391": "me 114514"
+	"language": "en-us",
+    "command_map": {
+        "393": "me I used clock"
     },
     "timer": {
         "1200": "say Welcome to the server"
     },
-    "banItems": [],
-    "logItems": [
+    "ban_items": [],
+    "log_items": [
         7
     ],
     "force_enable_ability": false,
-    "FAKE_SEED": 114514,
-    "NO_EXPLOSION": false,
-    "MAX_CHAT_LEN": 1919,
-    "NoEndermanTakeBlock": true,
-    "ProtectFarmBlock": true
+    "fake_seed": 114514,
+    "no_explosion": false,
+    "max_chat_length": 1919,
+    "no_enderman_take_block": true,
+    "protect_farm_block": true
 }
diff --git a/plugins/LLHelper/langpack/en-us.json b/plugins/LLHelper/langpack/en-us.json
diff --git a/plugins/LLMoney/langpack/en-us.json b/plugins/LLMoney/langpack/en-us.json
diff --git a/plugins/LLMoney/money.json b/plugins/LLMoney/money.json
@@ -1,4 +1,5 @@
 {
+	"language": "en-us",
     "def_money": 0,
     "pay_tax": 0.0
 }
diff --git a/plugins/LLtpa/langpack/en-us.json b/plugins/LLtpa/langpack/en-us.json
@@ -14,6 +14,8 @@
     "tpa.reason.deny": "Tpa request deny",
     "tpa.reason.timeout": "Tpa request timeout",
     "tpa.reason.accept": "Tpa request accepted",
+    "tpa.reason.notonline": "Target player not online",
+    "tpa.reason.cancel": "Tpa request cancelled",
     "tpa.back.use": "Using /back to back to your death point",
     "tpa.request.title": "Tpa request",
     "tpa.request.accept": "Accept",
diff --git a/plugins/LLtpa/langpack/zh-cn.json b/plugins/LLtpa/langpack/zh-cn.json
@@ -11,9 +11,11 @@
     "warp.gui.content": "选择一个传送点",
     "tpa.req.A_B": " 发起了一个传送到你的请求,使用/tpa ac接受,/tpa de拒绝",
     "tpa.req.B_A": " 发起了一个传送到他的请求,使用/tpa ac接受,/tpa de拒绝",
-    "tpa.reason.deny": "TPA请求被拒绝",
-    "tpa.reason.timeout": "TPA请求因超时自动取消",
-    "tpa.reason.accept": "TPA请求已经被接受",
+    "tpa.reason.deny": "Tpa请求被拒绝",
+    "tpa.reason.timeout": "Tpa请求因超时自动取消",
+    "tpa.reason.accept": "Tpa请求已经被接受",
+    "tpa.reason.notonline": "目标玩家不在线",
+    "tpa.reason.cancel": "Tpa请求已取消",
     "tpa.back.use": "可以使用/back返回上一个死亡点！",
     "tpa.request.title": "Tpa请求",
     "tpa.request.accept": "接受",
diff --git a/plugins/LLtpa/tpa.json b/plugins/LLtpa/tpa.json
@@ -1,10 +1,11 @@
 {
+	"language": "en-us",
     "max_homes": 3,
     "tpa_timeout": 20000,
     "tpa_ratelimit": 5000,
     "home_land_distance": 8,
-    "BACK_ENABLED": true,
-    "SUICIDE_ENABLED": true,
-    "TPA_ENABLED": true,
-    "HOME_ENABLED": true
+    "back_enabled": true,
+    "suicide_enabled": true,
+    "tpa_enabled": true,
+    "home_enabled": true
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`{`
	`2`	`+ "language": "en-us",`
`2`	`3`	`"def_money": 0,`
`3`	`4`	`"pay_tax": 0.0`
`4`	`5`	`}`