Merge pull request #617 from THEXN/master

更新：TShock5.2.1版本更新
UnrealMultiple · Dec 20, 2024 · a81fd50 · a81fd50
2 parents 99db001 + f508666
commit a81fd50
Show file tree

Hide file tree

Showing 134 changed files with 249 additions and 267 deletions.
diff --git a/src/AdditionalPylons/AdditionalPylonsPlugin.cs b/src/AdditionalPylons/AdditionalPylonsPlugin.cs
@@ -15,7 +15,7 @@ public class AdditionalPylonsPlugin : LazyPlugin
     #region Plugin Properties
     public override string Name => "[放置更多晶塔] AdditionalPylons";
 
-    public override Version Version => new Version(1, 0, 5);
+    public override Version Version => new Version(1, 0, 6);
 
     public override string Author => "Stealownz,肝帝熙恩优化1449";
 

diff --git a/src/AnnouncementBoxPlus/Plugin.cs b/src/AnnouncementBoxPlus/Plugin.cs
@@ -23,7 +23,7 @@ public class AnnouncementBoxPlus : LazyPlugin
     public override string Name => "AnnouncementBoxPlus";
 
     //插件的版本
-    public override Version Version => new Version(1, 0, 2);
+    public override Version Version => new Version(1, 0, 3);
 
     //插件的构造器
     public AnnouncementBoxPlus(Main game) : base(game)

diff --git a/src/AutoAirItem/AutoAirItem.cs b/src/AutoAirItem/AutoAirItem.cs
@@ -12,7 +12,7 @@ public class AutoAirItem : LazyPlugin
     #region 插件信息
     public override string Name => "自动垃圾桶";
     public override string Author => "羽学";
-    public override Version Version => new Version(1, 2, 5);
+    public override Version Version => new Version(1, 2, 6);
     public override string Description => "涡轮增压不蒸鸭";
     #endregion
 

diff --git a/src/AutoBroadcast/ABConfig.cs b/src/AutoBroadcast/ABConfig.cs
@@ -9,7 +9,7 @@ namespace AutoBroadcast;
 public class ABConfig : JsonConfigBase<ABConfig>
 {
     [LocalizedPropertyName(CultureType.Chinese, "广播列表")]
-    [LocalizedPropertyName(CultureType.English, "broadcasts")]
+    [LocalizedPropertyName(CultureType.English, "Broadcasts")]
     public Broadcast[] Broadcasts { get; set; } = Array.Empty<Broadcast>();
 
     protected override string Filename => "AutoBroadcast";
@@ -22,7 +22,7 @@ protected override void SetDefault()
             {
                 Name = "示例广播",
                 Enabled = true,
-                Messages = new string[] { "/time 4:30", "设置时间为4:30" },
+                Messages = new string[] { "/say Ciallo～(∠・ω< )⌒★", "自动广播执行了服务器指令/say Ciallo～(∠・ω< )⌒★" },
                 ColorRGB = new float[] { 255, 234, 115 },
                 Interval = 600,
             }
@@ -33,38 +33,38 @@ protected override void SetDefault()
 public class Broadcast
 {
     [LocalizedPropertyName(CultureType.Chinese, "广播名称")]
-    [LocalizedPropertyName(CultureType.English, "name")]
+    [LocalizedPropertyName(CultureType.English, "Name")]
     public string Name { get; set; } = string.Empty;
 
     [LocalizedPropertyName(CultureType.Chinese, "启用")]
-    [LocalizedPropertyName(CultureType.English, "enable")]
+    [LocalizedPropertyName(CultureType.English, "Enable")]
     public bool Enabled { get; set; } = false;
 
     [LocalizedPropertyName(CultureType.Chinese, "广播消息")]
-    [LocalizedPropertyName(CultureType.English, "msg")]
+    [LocalizedPropertyName(CultureType.English, "Msg")]
     public string[] Messages { get; set; } = Array.Empty<string>();
 
     [LocalizedPropertyName(CultureType.Chinese, "RGB颜色")]
-    [LocalizedPropertyName(CultureType.English, "color")]
+    [LocalizedPropertyName(CultureType.English, "Color")]
     public float[] ColorRGB { get; set; } = new float[3];
 
     [LocalizedPropertyName(CultureType.Chinese, "时间间隔")]
-    [LocalizedPropertyName(CultureType.English, "interval")]
+    [LocalizedPropertyName(CultureType.English, "Interval")]
     public int Interval { get; set; } = 0;
 
     [LocalizedPropertyName(CultureType.Chinese, "延迟执行")]
-    [LocalizedPropertyName(CultureType.English, "delay")]
+    [LocalizedPropertyName(CultureType.English, "Delay")]
     public int StartDelay { get; set; } = 0;
 
     [LocalizedPropertyName(CultureType.Chinese, "广播组")]
-    [LocalizedPropertyName(CultureType.English, "groups")]
+    [LocalizedPropertyName(CultureType.English, "Groups")]
     public string[] Groups { get; set; } = Array.Empty<string>();
 
     [LocalizedPropertyName(CultureType.Chinese, "触发词语")]
-    [LocalizedPropertyName(CultureType.English, "triggerWords")]
+    [LocalizedPropertyName(CultureType.English, "TriggerWords")]
     public string[] TriggerWords { get; set; } = Array.Empty<string>();
 
     [LocalizedPropertyName(CultureType.Chinese, "触发整个组")]
-    [LocalizedPropertyName(CultureType.English, "triggerToWholeGroup")]
+    [LocalizedPropertyName(CultureType.English, "TriggerToWholeGroup")]
     public bool TriggerToWholeGroup { get; set; } = false;
 }
diff --git a/src/AutoBroadcast/AutoBroadcast.cs b/src/AutoBroadcast/AutoBroadcast.cs
@@ -11,7 +11,7 @@ public class AutoBroadcast : LazyPlugin
     public override string Name => "AutoBroadcast";
     public override string Author => "Scavenger";
     public override string Description => "自动广播插件";
-    public override Version Version => new Version(1, 0, 7);
+    public override Version Version => new Version(1, 0, 8);
 
     public DateTime LastCheck = DateTime.UtcNow;
 

diff --git a/src/AutoBroadcast/README.en-US.md b/src/AutoBroadcast/README.en-US.md
@@ -11,47 +11,27 @@ None
 ```
 
 ## Config
-> Configuration file location：tshock/AutoBroadcast.json
+> Configuration file location：tshock/AutoBroadcast.en-US.json
 ```json
-{
-  "广播列表": [ 
-    {
-      "广播名称": "实例广播",
-      "启用": false,
-      "广播消息": [
-        "这是一条广播",
-        "每五分钟执行一次",
-        "可以执行命令",
-        "/time noon"
-      ],
-      "RGB颜色": [255.0, 0.0, 0.0],
-      "时间间隔": 300,
-      "延迟执行": 60,
-      "广播组": [],
-      "触发词语": [], //可以设置聊天消息关键词触发此广播
-      "触发整个组": false //开启后将会对'广播组'内所有玩家执行此广播
-    }
-  ]
-}
-
-// You can refer to this:
 {
   "Broadcasts": [
     {
-      "Name": "Example Broadcast",
-      "Enabled": false,
-      "Messages": [
-        "This is an example broadcast",
-        "It will broadcast every 5 minutes",
-        "Broadcasts can also execute commands",
-        "/time noon"
+      "Name": "示例广播",
+      "Enable": true,
+      "Msg": [
+        "/say Ciallo～(∠・ω< )⌒★",
+        "The auto broadcast executed the server command /say Ciallo～(∠・ω< )⌒★"
+      ],
+      "Color": [
+        255.0,
+        234.0,
+        115.0
       ],
-      "ColorRGB": [255.0, 0.0, 0.0],
-      "Interval": 300,
-      "StartDelay": 60,
-      "Groups"": [],
+      "Interval": 600, // This is the interval time in seconds.
+      "Delay": 0, // This is the delay before the first broadcast starts.
+      "Groups": [], // Define specific groups for this broadcast.
       "TriggerWords": [], // You can set chat message keywords to trigger this broadcast.
-      "TriggerToWholeGroup": false // When enabled, this broadcast will be executed for all players in the 'broadcast group'
+      "TriggerToWholeGroup": false // When enabled, this broadcast will be executed for all players in the 'broadcast group'.
     }
   ]
 }

diff --git a/src/AutoBroadcast/README.md b/src/AutoBroadcast/README.md
@@ -7,6 +7,8 @@
 ## 更新日志
 
 ```
+v1.0.8
+准备更新TS 5.2.1,修正文档，初始配置内容更改
 v1.0.6
 修复了初始配置文件的问题
 v1.0.5
@@ -20,25 +22,27 @@ i18n预定
 无
 
 ## 配置
-> 配置文件位置：tshock/AutoBroadcast.json
+> 配置文件位置：tshock/AutoBroadcast.zh-CN.json
 ```json
 {
   "广播列表": [
     {
-      "广播名称": "实例广播",
-      "启用": false,
+      "广播名称": "示例广播",
+      "启用": true,
       "广播消息": [
-        "这是一条广播",
-        "每五分钟执行一次",
-        "可以执行命令",
-        "/time noon"
+        "/say Ciallo～(∠・ω< )⌒★",
+        "自动广播执行了服务器指令/say Ciallo～(∠・ω< )⌒★"
       ],
-      "RGB颜色": [255.0, 0.0, 0.0],
-      "时间间隔": 300,
-      "延迟执行": 60,
+      "RGB颜色": [
+        255.0,
+        234.0,
+        115.0
+      ],
+      "时间间隔": 600,
+      "延迟执行": 0,
       "广播组": [],
-      "触发词语": [], //可以设置聊天消息关键词触发此广播
-      "触发整个组": false //开启后将会对'广播组'内所有玩家执行此广播
+      "触发词语": [],
+      "触发整个组": false
     }
   ]
 }

diff --git a/src/AutoClear/AutoClear.cs b/src/AutoClear/AutoClear.cs
@@ -12,7 +12,7 @@ public class Autoclear : LazyPlugin
     public override string Author => "大豆子[Mute适配1447]，肝帝熙恩更新";
     public override string Description => "智能扫地机";
     public override string Name => "智能自动扫地";
-    public override Version Version => new Version(1, 0, 5);
+    public override Version Version => new Version(1, 0, 6);
 
     private bool _sweepScheduled = false;
     private DateTime _sweepScheduledAt;

diff --git a/src/AutoClear/Configuration.cs b/src/AutoClear/Configuration.cs
@@ -11,50 +11,50 @@ public class Configuration : JsonConfigBase<Configuration>
     protected override string Filename => "AutoClear";
 
     [LocalizedPropertyName(CultureType.Chinese, "清理间隔")]
-    [LocalizedPropertyName(CultureType.English, "interval")]
+    [LocalizedPropertyName(CultureType.English, "Interval")]
     public int detectionIntervalSeconds { get; set; } = 100;
 
     [LocalizedPropertyName(CultureType.Chinese, "排除列表")]
-    [LocalizedPropertyName(CultureType.English, "exclude")]
+    [LocalizedPropertyName(CultureType.English, "Exclude")]
     public List<int> NonSweepableItemIDs { get; set; } = new List<int>();
 
     [LocalizedPropertyName(CultureType.Chinese, "清理阈值")]
-    [LocalizedPropertyName(CultureType.English, "threshold")]
+    [LocalizedPropertyName(CultureType.English, "Threshold")]
     public int SmartSweepThreshold { get; set; } = 10;
 
     [LocalizedPropertyName(CultureType.Chinese, "延迟清扫")]
-    [LocalizedPropertyName(CultureType.English, "dealy")]
+    [LocalizedPropertyName(CultureType.English, "Dealy")]
     public int DelayedSweepTimeoutSeconds { get; set; } = 10;
 
     [LocalizedPropertyName(CultureType.Chinese, "延迟清扫消息")]
-    [LocalizedPropertyName(CultureType.English, "dealyMsg")]
+    [LocalizedPropertyName(CultureType.English, "DealyMsg")]
     public string DelayedSweepCustomMessage { get; set; } = "";
 
     [LocalizedPropertyName(CultureType.Chinese, "清扫挥动武器")]
-    [LocalizedPropertyName(CultureType.English, "sweepSwinging")]
+    [LocalizedPropertyName(CultureType.English, "SweepSwinging")]
     public bool SweepSwinging { get; set; } = true;
 
     [LocalizedPropertyName(CultureType.Chinese, "清扫投掷武器")]
-    [LocalizedPropertyName(CultureType.English, "sweepThrowable")]
+    [LocalizedPropertyName(CultureType.English, "SweepThrowable")]
     public bool SweepThrowable { get; set; } = true;
 
     [LocalizedPropertyName(CultureType.Chinese, "清扫普通物品")]
-    [LocalizedPropertyName(CultureType.English, "sweepRegaular")]
+    [LocalizedPropertyName(CultureType.English, "SweepRegaular")]
     public bool SweepRegular { get; set; } = true;
 
     [LocalizedPropertyName(CultureType.Chinese, "清扫装备")]
-    [LocalizedPropertyName(CultureType.English, "sweepEquipment")]
+    [LocalizedPropertyName(CultureType.English, "SweepEquipment")]
     public bool SweepEquipment { get; set; } = true;
 
     [LocalizedPropertyName(CultureType.Chinese, "清扫时装")]
-    [LocalizedPropertyName(CultureType.English, "sweepVanity")]
+    [LocalizedPropertyName(CultureType.English, "SweepVanity")]
     public bool SweepVanity { get; set; } = true;
 
     [LocalizedPropertyName(CultureType.Chinese, "完成清扫消息")]
-    [LocalizedPropertyName(CultureType.English, "sweepMsg")]
+    [LocalizedPropertyName(CultureType.English, "SweepMsg")]
     public string CustomMessage { get; set; } = "";
 
     [LocalizedPropertyName(CultureType.Chinese, "清理提示")]
-    [LocalizedPropertyName(CultureType.English, "sweepTip")]
+    [LocalizedPropertyName(CultureType.English, "SweepTip")]
     public bool SpecificMessage { get; set; } = true;
 }
diff --git a/src/AutoClear/README.en-US.md b/src/AutoClear/README.en-US.md
@@ -6,22 +6,23 @@
 - Customize which items or categories of items are not to be cleaned.
 
 ## Config
-> Configuration file location：tshock/Autoclear.json
+> Configuration file location：tshock/Autoclear.en-US.json
 ```json
 {
-  "多久检测一次(s)": 10, // How often to check (seconds)
-  "不清扫的物品ID列表": [], // List of item IDs not to be cleaned
-  "智能清扫数量临界值": 100, // Threshold value for smart cleaning
-  "延迟清扫(s)": 10, // Delay cleaning (seconds)
-  "延迟清扫自定义消息": "", // Custom message for delayed cleaning
-  "是否清扫挥动武器": true, // Whether to clean Melee Weapons
-  "是否清扫投掷武器": true, // Whether to clean Consumables
-  "是否清扫普通物品": true, // Whether to clean Common Items
-  "是否清扫装备": true, // Whether to clean Armors
-  "是否清扫时装": true, // Whether to clean Vanity
-  "完成清扫自定义消息": "", // Custom message for completed cleaning
-  "具体消息": true // Broadcast clean message
+  "Interval": 10, // How often to check (seconds)
+  "Exclude": [], // List of item IDs not to be cleaned
+  "Threshold": 100, // Threshold value for smart cleaning
+  "Dealy": 10, // Delay cleaning (seconds)
+  "DealyMsg": "", // Custom message for delayed cleaning
+  "SweepSwinging": true, // Whether to clean Melee Weapons
+  "SweepThrowable": true, // Whether to clean Consumables
+  "SweepRegaular": true, // Whether to clean Common Items
+  "SweepEquipment": true, // Whether to clean Armors
+  "SweepVanity": true, // Whether to clean Vanity
+  "SweepMsg": "", // Custom message for completed cleaning
+  "SweepTip": true // Broadcast clean message
 }
+
 ```
 
 ## FeedBack

diff --git a/src/AutoClear/README.md b/src/AutoClear/README.md
@@ -8,6 +8,8 @@
 ## 更新日志
 
 ```
+v1.0.6
+准备更新TS 5.2.1,修正文档，初始配置内容更改
 v1.0.4
 添加英文翻译
 ```
@@ -19,7 +21,7 @@ v1.0.4
 ```
 
 ## 配置
-> 配置文件位置：tshock/Autoclear.json
+> 配置文件位置：tshock/Autoclear.zh-CN.json
 ```json
 {
   "多久检测一次(s)": 10,

diff --git a/src/AutoFish/AutoFish.cs b/src/AutoFish/AutoFish.cs
@@ -15,7 +15,7 @@ public class AutoFish : LazyPlugin
     #region 插件信息
     public override string Name => "自动钓鱼";
     public override string Author => "羽学 少司命";
-    public override Version Version => new Version(1, 3, 4);
+    public override Version Version => new Version(1, 3, 5);
     public override string Description => "涡轮增压不蒸鸭";
     #endregion