Merge branch 'master' of https://github.com/THEXN/TShockPlugin

UnrealMultiple · Jan 23, 2025 · b96245a · b96245a
2 parents e13f455 + f9e8570
commit b96245a
Show file tree

Hide file tree

Showing 33 changed files with 435 additions and 338 deletions.
diff --git a/Plugins.json b/Plugins.json
@@ -623,7 +623,7 @@
   },
   {
     "Name": "ChattyBridge",
-    "Version": "1.0.1.2",
+    "Version": "1.0.1.3",
     "Author": "少司命",
     "Description": {
       "en-US": "ChattyBridge",
@@ -1080,7 +1080,7 @@
   },
   {
     "Name": "Economics.RPG",
-    "Version": "2.0.0.2",
+    "Version": "2.0.0.3",
     "Author": "少司命",
     "Description": {
       "en-US": "Provides RPG gameplay!",
@@ -1125,7 +1125,7 @@
   },
   {
     "Name": "Economics.Skill",
-    "Version": "2.0.0.8",
+    "Version": "2.0.0.9",
     "Author": "少司命",
     "Description": {
       "en-US": "Let players have skills!",
@@ -1194,7 +1194,7 @@
   },
   {
     "Name": "EconomicsAPI",
-    "Version": "2.0.0.3",
+    "Version": "2.0.0.4",
     "Author": "少司命",
     "Description": {
       "en-US": "Provides economic system API",
@@ -2521,7 +2521,7 @@
   },
   {
     "Name": "VBY.GameContentModify",
-    "Version": "1.9.2.120",
+    "Version": "1.9.2.122",
     "Author": "yu",
     "Description": {
       "en-US": "一些游戏内容的修改 For Terraria v1.4.4.9",
@@ -2543,7 +2543,7 @@
   },
   {
     "Name": "VBY.OtherCommand",
-    "Version": "1.0.0.120",
+    "Version": "1.0.0.122",
     "Author": "yu",
     "Description": {
       "en-US": "一些其他的辅助命令",
@@ -2669,14 +2669,14 @@
     "Author": "z枳",
     "Description": {
       "en-US": "Player management, provides to modify any player information, allows players to back up, roll back, etc.",
-      "de-DE": "Player management, provides to modify any player information, allows players to back up, roll back, etc.",
-      "it-IT": "Player management, provides to modify any player information, allows players to back up, roll back, etc.",
-      "fr-FR": "Player management, provides to modify any player information, allows players to back up, roll back, etc.",
-      "es-ES": "Player management, provides to modify any player information, allows players to back up, roll back, etc.",
-      "ru-RU": "Player management, provides to modify any player information, allows players to back up, roll back, etc.",
-      "zh-CN": "Player management, provides to modify any player information, allows players to back up, roll back, etc.",
-      "pt-BR": "Player management, provides to modify any player information, allows players to back up, roll back, etc.",
-      "pl-PL": "Player management, provides to modify any player information, allows players to back up, roll back, etc."
+      "de-DE": "玩家管理，提供修改玩家的任何信息，允许玩家备份，可以回档等操作",
+      "it-IT": "玩家管理，提供修改玩家的任何信息，允许玩家备份，可以回档等操作",
+      "fr-FR": "玩家管理，提供修改玩家的任何信息，允许玩家备份，可以回档等操作",
+      "es-ES": "Gestión de jugadores, que brinda la posibilidad de modificar cualquier información del jugador, permitiéndoles realizar copias de seguridad, retroceder, etc.",
+      "ru-RU": "玩家管理，提供修改玩家的任何信息，允许玩家备份，可以回档等操作",
+      "zh-CN": "玩家管理，提供修改玩家的任何信息，允许玩家备份，可以回档等操作",
+      "pt-BR": "玩家管理，提供修改玩家的任何信息，允许玩家备份，可以回档等操作",
+      "pl-PL": "玩家管理，提供修改玩家的任何信息，允许玩家备份，可以回档等操作"
     },
     "AssemblyName": "ZHIPlayerManager",
     "Path": "ZHIPlayerManager.dll",

diff --git a/src/BuildMaster/i18n/template.pot b/src/BuildMaster/i18n/template.pot
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: BuildMaster\n"
-"POT-Creation-Date: 2025-01-08 13:15:35+0000\n"
-"PO-Revision-Date: 2025-01-08 13:15:35+0000\n"
+"POT-Creation-Date: 2025-01-22 17:42:12+0000\n"
+"PO-Revision-Date: 2025-01-22 17:42:12+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -322,7 +322,6 @@ msgstr ""
 msgid "成功设置房间(id:{0}) 的评分时间为{1}秒"
 msgstr ""
 
-#: ../../BuildPlayer.cs:69
 #: ../../MainPlugin.cs:353
 #: ../../MainPlugin.cs:378
 #: ../../MainPlugin.cs:403
@@ -338,6 +337,7 @@ msgstr ""
 #: ../../MainPlugin.cs:668
 #: ../../MainPlugin.cs:692
 #: ../../MainPlugin.cs:756
+#: ../../BuildPlayer.cs:69
 msgid "房间不存在"
 msgstr ""
 
@@ -451,12 +451,12 @@ msgstr ""
 msgid "点未选取完毕"
 msgstr ""
 
-#: ../../BuildPlayer.cs:56
-#: ../../BuildPlayer.cs:78
 #: ../../MainPlugin.cs:774
 #: ../../MainPlugin.cs:800
 #: ../../MainPlugin.cs:805
 #: ../../MainPlugin.cs:861
+#: ../../BuildPlayer.cs:56
+#: ../../BuildPlayer.cs:78
 msgid "玩家 "
 msgstr ""
 

diff --git a/src/Challenger/i18n/template.pot b/src/Challenger/i18n/template.pot
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Challenger\n"
-"POT-Creation-Date: 2025-01-08 13:15:39+0000\n"
-"PO-Revision-Date: 2025-01-08 13:15:39+0000\n"
+"POT-Creation-Date: 2025-01-22 17:42:16+0000\n"
+"PO-Revision-Date: 2025-01-22 17:42:16+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -403,8 +403,8 @@ msgstr ""
 msgid "冲刺类饰品冷却完成"
 msgstr ""
 
-#: ../../Challenger.CNPCs/Skeletron.cs:164
 #: ../../Challenger.CNPCs/EaterofWorldsHead.cs:39
+#: ../../Challenger.CNPCs/Skeletron.cs:164
 msgid "创死你"
 msgstr ""
 

diff --git a/src/ChattyBridge/Plugin.cs b/src/ChattyBridge/Plugin.cs
@@ -2,9 +2,7 @@
 using LazyAPI;
 using Newtonsoft.Json.Linq;
 using Rests;
-using System.Net;
 using System.Reflection;
-using System.Text;
 using System.Web;
 using Terraria;
 using TerrariaApi.Server;
@@ -18,7 +16,7 @@ public class Plugin : LazyPlugin
     public override string Author => "少司命";
     public override string Description => Assembly.GetExecutingAssembly().GetName().Name!;
     public override string Name => Assembly.GetExecutingAssembly().GetName().Name!;
-    public override Version Version => new Version(1, 0, 1, 2);
+    public override Version Version => new Version(1, 0, 1, 3);
 
     private readonly HttpClient _client  = new ();
 
@@ -53,15 +51,14 @@ protected override void Dispose(bool disposing)
     private static object HandleMsg(RestRequestArgs args)
     {
         var msg = args.Parameters["msg"];
-        var isVer = args.Parameters["verify"] == Config.Instance.Verify;
-        if (!isVer)
+        TShock.Log.ConsoleDebug($"ChattyBridge Receive: {msg}");
+        if (args.Parameters["verify"] != Config.Instance.Verify)
         {
-            return new RestObject("403");
+            return new RestObject("403") { Response = "ChattyBridge Token Verify Error!" };
         }
         try
         {
-            var sourceMsg = Encoding.UTF8.GetString(Convert.FromBase64String(msg));
-            var json = JObject.Parse(sourceMsg);
+            var json = JObject.Parse(msg);
             if (json.TryGetValue("type", out var type))
             {
                 switch (type.ToString())
@@ -93,25 +90,23 @@ private static object HandleMsg(RestRequestArgs args)
         }
         catch (Exception ex)
         {
-            TShock.Log.ConsoleError(ex.ToString());
-            return new RestObject("500");
+            return new RestObject("500") { Response = $"An error occurred in the processing of the message: {ex.Message}" };
         }
-        return new RestObject("200");
+        return new RestObject("200") { Response = "Message Send Successfully!" };
     }
 
     private void SendMsg(string msg)
     {
-        Task.Run(() =>
+        Task.Run(async () =>
         {
-            var baseStr = Convert.ToBase64String(Encoding.UTF8.GetBytes(msg));
             foreach (var host in Config.Instance.RestHost)
             {
                 try
                 {
                     var url = $"http://{host}/chat";
-                    this.HttpGet(url, new Dictionary<string, string>
+                    await this.HttpGet(url, new Dictionary<string, string>
                     {
-                        { "msg", baseStr },
+                        { "msg", msg },
                         { "verify", Config.Instance.Verify }
                     });
                 }
@@ -123,7 +118,7 @@ private void SendMsg(string msg)
         });
     }
 
-    private void HttpGet(string url, Dictionary<string, string> payload)
+    private async Task HttpGet(string url, Dictionary<string, string> payload)
     {
         var urlBuilder = new UriBuilder(url);
         var param = HttpUtility.ParseQueryString(urlBuilder.Query);
@@ -132,18 +127,19 @@ private void HttpGet(string url, Dictionary<string, string> payload)
             param[key] = value;
         }
         urlBuilder.Query = param.ToString();
-        var response =  this._client.Send(new HttpRequestMessage(HttpMethod.Get, urlBuilder.ToString()));
-        switch (response.StatusCode)
+        var response = await this._client.GetAsync(urlBuilder.ToString());
+        try
+        {
+            TShock.Log.ConsoleDebug($"ChattyBridge Send: {payload["msg"]}");
+            response.EnsureSuccessStatusCode();
+        }
+        catch (HttpRequestException e)
+        {
+            TShock.Log.ConsoleError($"[ChattyBridge] Error: {e.Message}");
+        }
+        finally
         {
-            case HttpStatusCode.OK:
-                break;
-            case HttpStatusCode.Unauthorized:
-                 TShock.Log.ConsoleError(GetString($"[聊天桥] 访问目标服务器验证失败:{url},请检查你的令牌是否配置正确!"));
-                 break;
-            case HttpStatusCode.InternalServerError:
-                TShock.Log.ConsoleError(GetString($"[聊天桥] 目标服务器处理请求出错:{url}!"));
-                break;
-
+            TShock.Log.ConsoleDebug($"ChattyBridage Response: {await response.Content.ReadAsStringAsync()}");
         }
     }
 

diff --git a/src/ChattyBridge/i18n/template.pot b/src/ChattyBridge/i18n/template.pot
@@ -1,34 +1,24 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ChattyBridge\n"
-"POT-Creation-Date: 2025-01-11 17:27:41+0000\n"
-"PO-Revision-Date: 2025-01-11 17:27:41+0000\n"
+"POT-Creation-Date: 2025-01-22 17:42:17+0000\n"
+"PO-Revision-Date: 2025-01-22 17:42:17+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: GetText.NET Extractor\n"
 
-#: ../../Plugin.cs:120
+#: ../../Plugin.cs:115
 #, csharp-format
 msgid ""
 "[聊天桥] 信息发送失败，目标地址:{0}\n"
 "错误信息:{1}"
 msgstr ""
 
-#: ../../Plugin.cs:89
+#: ../../Plugin.cs:86
 #, csharp-format
 msgid "[聊天桥] 接收到未知类型:{0}"
 msgstr ""
 
-#: ../../Plugin.cs:144
-#, csharp-format
-msgid "[聊天桥] 目标服务器处理请求出错:{0}!"
-msgstr ""
-
-#: ../../Plugin.cs:141
-#, csharp-format
-msgid "[聊天桥] 访问目标服务器验证失败:{0},请检查你的令牌是否配置正确!"
-msgstr ""
-
diff --git a/src/DamageRuleLoot/i18n/en-US.po b/src/DamageRuleLoot/i18n/en-US.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tshock-chinese-plugin\n"
-"POT-Creation-Date: 2025-01-08 13:15:44+0000\n"
-"PO-Revision-Date: 2025-01-10 01:11\n"
+"POT-Creation-Date: 2025-01-20 06:56:35+0000\n"
+"PO-Revision-Date: 2025-01-21 01:07\n"
 "Last-Translator: \n"
 "Language-Team: English\n"
 "MIME-Version: 1.0\n"
@@ -77,7 +77,7 @@ msgstr "[c/F06576:【Stop Rotation】] Player:[c/F06576:{0}] "
 msgid "[c/F06576:【注意】]输出少于 [c/A7DDF0:{0:0.00%}] 禁止掉落宝藏袋:\n"
 msgstr "[c/F06576:【Attention】] Output less than [c/A7DDF0:{0:0.00%}] prohibits dropping of treasure bag:\n"
 
-#: ../../DamageRuleLoot.cs:81
+#: ../../DamageRuleLoot.cs:82
 #, csharp-format
 msgid "[c/FBF069:【暴击】] 玩家:[c/F06576:{0}] "
 msgstr "[c/FBF069:【Critical Hit】] Player: [c/F06576:{0}] "
@@ -92,15 +92,15 @@ msgstr "[c/FBF069:【Damage Transfer】] Player: [c/F06576:{0}] "
 msgid "[c/FBF069:【转移】] 玩家:[c/F06576:{0}] "
 msgstr "[c/FBF069:【Transfer】] Player: [c/F06576:{0}] "
 
-#: ../../DamageRuleLoot.cs:52
+#: ../../DamageRuleLoot.cs:53
 msgid "[伤害规则掉落]重新加载配置完毕。"
 msgstr "[Damage Rule Loot] Configuration reload complete。"
 
-#: ../../DamageRuleLoot.cs:348
+#: ../../DamageRuleLoot.cs:349
 msgid "双子魔眼"
 msgstr "The Twins"
 
-#: ../../DamageRuleLoot.cs:82
+#: ../../DamageRuleLoot.cs:83
 #, csharp-format
 msgid "对象:[c/AEA3E4:{0}] 满血:[c/FBF069:{1}] "
 msgstr "Target: [c/AEA3E4:{0}] Full Health: [c/FBF069:{1}] "
@@ -111,24 +111,24 @@ msgstr "Target: [c/AEA3E4:{0}] Full Health: [c/FBF069:{1}] "
 msgid "攻击对象:[c/AEA3E4:{0}] | "
 msgstr "Attack Target: [c/AEA3E4:{0}] | "
 
-#: ../../DamageRuleLoot.cs:84
+#: ../../DamageRuleLoot.cs:85
 #, csharp-format
 msgid "暴击数:[c/FBF069:{0}]"
 msgstr "Critical Hits: [c/FBF069:{0}]"
 
-#: ../../DamageRuleLoot.cs:483
+#: ../../DamageRuleLoot.cs:479
 msgid "月亮领主"
 msgstr "Moon Lord"
 
-#: ../../DamageRuleLoot.cs:17
+#: ../../DamageRuleLoot.cs:18
 msgid "根据输出排名榜决定是否掉落宝藏袋的惩罚，并对各个BOSS进行相对的伤害规则处理"
 msgstr "The penalty for dropping treasure bags is determined based on the output ranking list, and relative damage rules are dealt with for each BOSS."
 
-#: ../../DamageRuleLoot.cs:430
+#: ../../DamageRuleLoot.cs:431
 msgid "火星飞碟"
 msgstr "Martian Saucer"
 
-#: ../../DamageRuleLoot.cs:452
+#: ../../DamageRuleLoot.cs:448
 msgid "猪龙鱼公爵"
 msgstr "Duke Fishron"
 
@@ -138,15 +138,15 @@ msgstr "Duke Fishron"
 msgid "生命:[c/FBF069:{0}]"
 msgstr "Life:[c/FBF069:{0}]"
 
-#: ../../DamageRuleLoot.cs:659
+#: ../../DamageRuleLoot.cs:655
 msgid "美杜莎"
 msgstr "MechQueen"
 
-#: ../../DamageRuleLoot.cs:311
+#: ../../DamageRuleLoot.cs:312
 msgid "血肉墙"
 msgstr "Wall of Flesh"
 
-#: ../../DamageRuleLoot.cs:83
+#: ../../DamageRuleLoot.cs:84
 #, csharp-format
 msgid "血量:[c/6DDA6D:{0}] 伤害:[c/F06576:{1}] "
 msgstr "Health: [c/6DDA6D:{0}] Damage: [c/F06576:{1}] "