更新：添加限制箱子更改名字的权限

Plugin.sln

@@ -114,8 +114,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MiniGamesAPI", "src\MiniGam
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BuildMaster", "src\BuildMaster\BuildMaster.csproj", "{B0BE2A00-4B6C-4170-B159-EFE5EAA175DA}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "journeyUnlock", "src\journeyUnlock\journeyUnlock.csproj", "{5F1AE666-CFDD-4BE7-9C24-1D505BC56BAE}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WikiLangPackLoader", "src\WikiLangPackLoader\WikiLangPackLoader.csproj", "{37CB1619-7451-41CB-91E1-8F473839631B}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ListPlugins", "src\ListPlugins\ListPlugins.csproj", "{9738B985-8435-4D15-ADCE-817DFDD44D0C}"
@@ -230,6 +228,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnseenInventory", "src\Unse
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ChestRestore", "src\ChestRestore\ChestRestore.csproj", "{0C2924D3-41E7-417A-990D-46AEFF754662}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JourneyUnlock", "src\JourneyUnlock\JourneyUnlock.csproj", "{887D9FA9-374E-4DB3-B170-2636D1F3C034}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -662,14 +662,6 @@ Global
 		{B0BE2A00-4B6C-4170-B159-EFE5EAA175DA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B0BE2A00-4B6C-4170-B159-EFE5EAA175DA}.Release|x64.ActiveCfg = Release|Any CPU
 		{B0BE2A00-4B6C-4170-B159-EFE5EAA175DA}.Release|x64.Build.0 = Release|Any CPU
-		{5F1AE666-CFDD-4BE7-9C24-1D505BC56BAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5F1AE666-CFDD-4BE7-9C24-1D505BC56BAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5F1AE666-CFDD-4BE7-9C24-1D505BC56BAE}.Debug|x64.ActiveCfg = Debug|x64
-		{5F1AE666-CFDD-4BE7-9C24-1D505BC56BAE}.Debug|x64.Build.0 = Debug|x64
-		{5F1AE666-CFDD-4BE7-9C24-1D505BC56BAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5F1AE666-CFDD-4BE7-9C24-1D505BC56BAE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5F1AE666-CFDD-4BE7-9C24-1D505BC56BAE}.Release|x64.ActiveCfg = Release|x64
-		{5F1AE666-CFDD-4BE7-9C24-1D505BC56BAE}.Release|x64.Build.0 = Release|x64
 		{37CB1619-7451-41CB-91E1-8F473839631B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{37CB1619-7451-41CB-91E1-8F473839631B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{37CB1619-7451-41CB-91E1-8F473839631B}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1126,6 +1118,14 @@ Global
 		{0C2924D3-41E7-417A-990D-46AEFF754662}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0C2924D3-41E7-417A-990D-46AEFF754662}.Release|x64.ActiveCfg = Release|Any CPU
 		{0C2924D3-41E7-417A-990D-46AEFF754662}.Release|x64.Build.0 = Release|Any CPU
+		{887D9FA9-374E-4DB3-B170-2636D1F3C034}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{887D9FA9-374E-4DB3-B170-2636D1F3C034}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{887D9FA9-374E-4DB3-B170-2636D1F3C034}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{887D9FA9-374E-4DB3-B170-2636D1F3C034}.Debug|x64.Build.0 = Debug|Any CPU
+		{887D9FA9-374E-4DB3-B170-2636D1F3C034}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{887D9FA9-374E-4DB3-B170-2636D1F3C034}.Release|Any CPU.Build.0 = Release|Any CPU
+		{887D9FA9-374E-4DB3-B170-2636D1F3C034}.Release|x64.ActiveCfg = Release|Any CPU
+		{887D9FA9-374E-4DB3-B170-2636D1F3C034}.Release|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

README.md

@@ -123,7 +123,7 @@ powershell -ExecutionPolicy ByPass -File ./install.ps1 -verb runas
 | [Challenger](src/Challenger/README.md)                               |          挑战者模式          |                                                                        无                                                                         |
 | [MiniGamesAPI](src/MiniGamesAPI/README.md)                           |        豆沙小游戏 API        |                                                                        无                                                                         |
 | [BuildMaster](src/BuildMaster/README.md)                             |      豆沙小游戏·建筑大师模式       |                                                      [MiniGamesAPI](src/MiniGamesAPI/README.md)                                                      |
-| [journeyUnlock](src/journeyUnlock/README.md)                         |         解锁旅途物品          |                                                                        无                                                                         |
+| [JourneyUnlock](src/JourneyUnlock/README.md)                         |         解锁旅途物品          |                                                                        无                                                                         |
 | [ListPlugins](src/ListPlugins/README.md)                             |          查已装插件          |                                                                        无                                                                         |
 | [BagPing](src/BagPing/README.md)                                     |        地图上标记宝藏袋         |                                                                        无                                                                         |
 | [ServerTools](src/ServerTools/README.md)                             |         服务器管理工具         |                                                                        无                                                                         |

src/ChestRestore/MainPlugin.cs

@@ -12,14 +12,14 @@ public MainPlugin(Main game) : base(game)
     {
     }
     public override string Name => "ChestRestore";
-    public override Version Version => new Version(1, 0, 1);
+    public override Version Version => new Version(1, 0, 2);
     public override string Author => "Cjx修改，肝帝熙恩简单修改";
     public override string Description => "无限宝箱插件";
 
     public override void Initialize()
     {
-        ServerApi.Hooks.NetGetData.Register(this, this.OnGetData);
-        GetDataHandlers.ChestOpen += this.OnChestOpen;
+        ServerApi.Hooks.NetGetData.Register(this, OnGetData);
+        GetDataHandlers.ChestOpen += OnChestOpen;
     }
     private void OnChestOpen(object sender, GetDataHandlers.ChestOpenEventArgs args)
     {
@@ -54,17 +54,28 @@ private void OnGetData(GetDataEventArgs args)
     {
         if (args.MsgID == PacketTypes.ChestOpen)
         {
+            TSPlayer tsplayer = TShock.Players[args.Msg.whoAmI];
+
+            if (tsplayer == null)
+            {
+                return; 
+            }
+
+            if (args.Length > 7 && !tsplayer.HasPermission("chestopen.name"))
+            {
+                args.Msg.readBuffer[args.Index + 6] = 0;
+            }
+
             using (var binaryReader = new BinaryReader(new MemoryStream(args.Msg.readBuffer, args.Index, args.Length)))
             {
-                var tsplayer = TShock.Players[args.Msg.whoAmI];
-                int num = binaryReader.ReadInt16();
-                var num2 = Chest.FindChest(tsplayer.GetData<int>("chestx"), tsplayer.GetData<int>("chesty"));
+                int chestId = binaryReader.ReadInt16();
+                var chestIndex = Chest.FindChest(tsplayer.GetData<int>("chestx"), tsplayer.GetData<int>("chesty"));
                 Chest chest = null;
-                if (num2 != -1)
+                if (chestIndex != -1)
                 {
-                    chest = Main.chest[num2];
+                    chest = Main.chest[chestIndex];
                 }
-                if (num == -1 && chest != null)
+                if (chestId == -1 && chest != null)
                 {
                     var list = JsonConvert.DeserializeObject<List<NetItem>>(tsplayer.GetData<string>("chestrestore"));
                     for (var i = 0; i < chest.item.Length; i++)
@@ -73,7 +84,7 @@ private void OnGetData(GetDataEventArgs args)
                         item.netDefaults(list[i].NetId);
                         item.stack = list[i].Stack;
                         item.prefix = list[i].PrefixId;
-                        TSPlayer.All.SendData(PacketTypes.ChestItem, "", num2, (float) i, 0f, 0f, 0);
+                        TSPlayer.All.SendData(PacketTypes.ChestItem, "", chestIndex, i, 0f, 0f, 0);
                     }
                     tsplayer.SetData("chestrestore", "");
                     tsplayer.SetData("chestx", 0);
@@ -82,12 +93,13 @@ private void OnGetData(GetDataEventArgs args)
             }
         }
     }
+
     protected override void Dispose(bool disposing)
     {
         if (disposing)
         {
-            ServerApi.Hooks.NetGetData.Deregister(this, this.OnGetData);
-            GetDataHandlers.ChestOpen -= this.OnChestOpen;
+            ServerApi.Hooks.NetGetData.Deregister(this, OnGetData);
+            GetDataHandlers.ChestOpen -= OnChestOpen;
         }
         base.Dispose(disposing);
     }

src/ChestRestore/README.md

@@ -1,18 +1,22 @@
-# ChestRestore
+# ChestRestore 无限宝箱和禁止箱子改名
 
 - 作者: 佚名，Cjx修改，肝帝熙恩简单修改
-- 无限宝箱插件，装上后全局宝箱无限拿取且不可更改
+- 无限宝箱插件，装上后全局宝箱无限拿取且不可更改，箱子名字必须有权限`chestopen.name`才可更改
 
 ## 更新日志
 
 ```
+v1.0.2
+添加限制箱子更改名字的权限
 v1.0.1
 优化简化部分代码
 ```
 
 ## 指令
 
-无
+| 语法      |    权限     |        说明        |
+| --------- | :---------: | :----------------: |
+| 无 | chestopen.name |   有该权限的玩家才可改箱子名字   |
 
 ## 配置
 

src/journeyUnlock/journeyUnlock.cs → src/JourneyUnlock/JourneyUnlock.cs

@@ -14,9 +14,9 @@ public class journeyUnlock : TerrariaPlugin
 
     public override string Description => "允许您为旅途中的角色解锁所有或特定物品";
 
-    public override string Name => "journeyUnlock";
+    public override string Name => "JourneyUnlock";
 
-    public override Version Version => new(1, 0, 1, 1);
+    public override Version Version => new(1, 0, 1, 2);
 
     public journeyUnlock(Main game) : base(game)
     {

src/journeyUnlock/README.md → src/JourneyUnlock/README.md

@@ -1,4 +1,4 @@
-# journeyUnlock 解锁旅途物品
+# JourneyUnlock 解锁旅途物品
 
 - 作者: Maxthegreat99，肝帝熙恩汉化
 - 出处: [github](https://github.com/Maxthegreat99/journeyUnlock)
@@ -7,6 +7,8 @@
 ## 更新日志
 
 ```
+v1.0.0.2
+只是改大写名字而已
 v1.0.1.1
 补全卸载函数
 ```

src/MusicPlayer/README.md

@@ -3,10 +3,13 @@
 - 作者: Olink，Cjx适配，肝帝熙恩修改, yu大改
 - 出处: [github](https://github.com/Olink/SongPlayer) 远古仓库
 - 装上插件会在Tshock文件夹下生成一个Songs文件夹，里面放音乐文件
-- 通过读取音高文件，使用竖琴/铃铛/吉他模拟播放音乐
-- 提供了[简易转换脚本](https://github.com/THEXN/TShockPlugin/blob/master/musicplayer/sample_converter.py)，你也可以自己手搓,和[示范音乐转换文件（mid），和成品文件](https://github.com/THEXN/TShockPlugin/tree/master/musicplayer/%E7%A4%BA%E4%BE%8B%E6%AD%8C%E6%9B%B2)
-- 不推荐过高音和过低音，泰拉本身不支持，音高范围为C4-C6
-- 
+- 通过读取音高文件，使用竖琴/铃铛/吉他模拟播放音乐，也就是参数：harp，bell，theaxe
+- 提供了[简易转换脚本](https://github.com/UnrealMultiple/TShockPlugin/blob/master/src/MusicPlayer/sample_converter.py)
+- 和[便捷exe工具](https://github.com/UnrealMultiple/TShockPlugin/blob/master/src/MusicPlayer/sample_converter.exe)，将mid文件拖动到便捷exe上即可转换
+- 你也可以自己手搓,这里有[示范音乐转换文件（mid），和成品文件](https://github.com/UnrealMultiple/TShockPlugin/tree/master/src/MusicPlayer/demo)
+- 不推荐过高音和过低音，泰拉本身不支持，音高范围为C4-C6，转换的时候并不会对该范围内的音高进行改动，保留且使用时不播放外围的音高
+- 只能播放非常简单的音乐，音轨越少越好，起伏越好，将常规mp3转换成mid再转换成本插件可用格式基本不可行，建议寻找专用的midi网站获取midi，或者自己扒谱
+
 ## 更新日志
 
 ```
@@ -17,9 +20,9 @@
 
 | 语法           |        权限         |   说明   |
 | -------------- | :-----------------: | :------: |
-| /song [歌曲名字] | song  | 为自己播放/停止播放歌曲 |
-| /songall [歌曲名字] | songall   | 为所有人播放/停止播放歌曲 |
-| /songlist [歌曲名字] | songlist   | 查看歌曲文件列表 |
+| /song [歌曲名字] [harp/bell/theaxe] | song  | 为自己播放/停止播放歌曲，默认参数为harp |
+| /songall [歌曲名字] [harp/bell/theaxe] | songall   | 为所有人播放/停止播放歌曲，默认参数为harp |
+| /songlist | songlist   | 查看歌曲文件列表 |
 
 ## 配置
 > tshock/Song文件夹内放音乐文件

src/Shared/I18n.cs

@@ -540,7 +540,7 @@ private static Catalog GetCatalog()
         return asm.GetManifestResourceInfo(moFilePath) == null ? new Catalog() : new Catalog(asm.GetManifestResourceStream(moFilePath));
 */
 
-/* Unmerged change from project 'journeyUnlock'
+/* Unmerged change from project 'JourneyUnlock'
 Before:
         if (asm.GetManifestResourceInfo(moFilePath) == null)
             return new Catalog();