Merge pull request #483 from UnrealMultiple/master

sync
UnrealMultiple · Sep 21, 2024 · f44ac92 · f44ac92
2 parents c48814e + 952767c
commit f44ac92
Show file tree

Hide file tree

Showing 26 changed files with 484 additions and 456 deletions.
diff --git a/.config/submodule_build.json b/.config/submodule_build.json
@@ -12,6 +12,24 @@
             "assembly_path": "src/Submodules/Yaaiomni/Misc/bin/{BuildType}/{TargetFramework}/Chireiden.TShock.Omni.Misc.dll",
             "readme": "src/Submodules/Yaaiomni/README.md"
         },
+        {
+            "name": "FishShop",
+            "project_path": "src/Submodules/TShockFishShop/TShockFishShop/FishShop.csproj",
+            "assembly_path": "src/Submodules/TShockFishShop/TShockFishShop/bin/{BuildType}/{TargetFramework}/FishShop.dll",
+            "readme": "src/Submodules/TShockFishShop/README.md"
+        },
+        {
+            "name": "PlayerManager",
+            "project_path": "src/Submodules/TShockPlayerManager/PlayerManager/PlayerManager.csproj",
+            "assembly_path": "src/Submodules/TShockPlayerManager/PlayerManager/bin/{BuildType}/{TargetFramework}/PlayerManager.dll",
+            "readme": "src/Submodules/TShockPlayerManager/README.md"
+        },
+        {
+            "name": "WorldModify",
+            "project_path": "src/Submodules/TShockWorldModify/WorldModify/WorldModify.csproj",
+            "assembly_path": "src/Submodules/TShockWorldModify/WorldModify/bin/{BuildType}/{TargetFramework}/WorldModify.dll",
+            "readme": "src/Submodules/TShockWorldModify/README.md"
+        },
         {
             "name": "Crossplay",
             "project_path": "src/Submodules/Crossplay/Crossplay/Crossplay.csproj",

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -61,6 +61,7 @@ jobs:
             tar xvf bin/TShock-Beta-linux-x64-Release.tar --directory bin
           }
           Copy-Item out/**/*.dll bin/ServerPlugins/
+          Copy-Item SubmoduleAssembly/*.dll bin/ServerPlugins/
           Set-Location bin
           ./TShock.Server -dump-plugins-list-only
           Set-Location ../
@@ -82,42 +83,6 @@ jobs:
           name: Plugins
           path: out/Plugins.zip
 
-      - name: 更新tag
-        if: github.event_name == 'push' && github.ref == 'refs/heads/master'
-        run: |
-          git tag -f V1.0.0.0
-          git push -f origin V1.0.0.0
-
-      - name: 获取更新日志
-        if: github.event_name == 'push' && github.ref == 'refs/heads/master'
-        id: external_changelog_second
-        uses: mikepenz/release-changelog-builder-action@v5
-        with:
-          configuration: ".config/log_config.json"
-
-      - name: 发布插件包
-        if: github.event_name == 'push' && github.ref == 'refs/heads/master'
-        uses: ncipollo/release-action@v1
-        with:
-          tag: V1.0.0.0
-          name: "最新版本"
-          body: |
-            # 插件下载和更新日志
-            ###  📅 每次仓库更新，我们都会在这里发布最新的Release。请注意，这个仓库只有一个Release，所以你总是能在这里找到最新的版本。
-            ###  📖介绍已经以MD的形式附在插件包中，可以使用文本编辑器打开。更推荐你直接在仓库主页中的[插件列表](https://github.com/UnrealMultiple/TShockPlugin?tab=readme-ov-file#%E5%B7%B2%E6%94%B6%E9%9B%86%E6%8F%92%E4%BB%B6)，点击插件名跳转。
-            ###  📦 你可以在页面的`最底部↓↓↓`找到插件包的下载链接。下载完成后，你需要使用`ZIP压缩工具`进行解压。
-            > [!CAUTION]
-            >**请你`仔细`地阅读`上面的说明`，不要到处问`插件怎么用`、`ZIP如何解压`**
-            <details>
-            <summary>更新日志</summary>
-            
-            ${{steps.external_changelog_second.outputs.changelog}}
-            </details>
-          artifacts: |
-            out/Plugins.zip
-          allowUpdates: true
-          removeArtifacts: true
-
       - name: 更新相关文件
         continue-on-error: true
         shell: pwsh
@@ -167,4 +132,40 @@ jobs:
         run: |
           sudo pip install beautifulsoup4
           python scripts/GiteeSync.py ${{ secrets.CAI_GITEE_TOKEN }}
-          sudo python scripts/ForumHelper.py Cai ${{ secrets.MONIKA_TR_PASSWORD }}
+          sudo python scripts/ForumHelper.py Cai ${{ secrets.MONIKA_TR_PASSWORD }}
+
+      - name: 更新tag
+        if: github.event_name == 'push' && github.ref == 'refs/heads/master'
+        run: |
+          git tag -f V1.0.0.0
+          git push -f origin V1.0.0.0
+
+      - name: 获取更新日志
+        if: github.event_name == 'push' && github.ref == 'refs/heads/master'
+        id: external_changelog_second
+        uses: mikepenz/release-changelog-builder-action@v5
+        with:
+          configuration: ".config/log_config.json"
+
+      - name: 发布插件包
+        if: github.event_name == 'push' && github.ref == 'refs/heads/master'
+        uses: ncipollo/release-action@v1
+        with:
+          tag: V1.0.0.0
+          name: "最新版本"
+          body: |
+            # 插件下载和更新日志
+            ###  📅 每次仓库更新，我们都会在这里发布最新的Release。请注意，这个仓库只有一个Release，所以你总是能在这里找到最新的版本。
+            ###  📖介绍已经以MD的形式附在插件包中，可以使用文本编辑器打开。更推荐你直接在仓库主页中的[插件列表](https://github.com/UnrealMultiple/TShockPlugin?tab=readme-ov-file#%E5%B7%B2%E6%94%B6%E9%9B%86%E6%8F%92%E4%BB%B6)，点击插件名跳转。
+            ###  📦 你可以在页面的`最底部↓↓↓`找到插件包的下载链接。下载完成后，你需要使用`ZIP压缩工具`进行解压。
+            > [!CAUTION]
+            >**请你`仔细`地阅读`上面的说明`，不要到处问`插件怎么用`、`ZIP如何解压`**
+            <details>
+            <summary>更新日志</summary>
+            
+            ${{steps.external_changelog_second.outputs.changelog}}
+            </details>
+          artifacts: |
+            out/Plugins.zip
+          allowUpdates: true
+          removeArtifacts: true
diff --git a/.gitmodules b/.gitmodules
@@ -4,3 +4,12 @@
 [submodule "src/Submodules/Crossplay"]
 	path = src/Submodules/Crossplay
 	url = https://github.com/UnrealMultiple/Crossplay.git
+[submodule "src/Submodules/TShockFishShop"]
+	path = src/Submodules/TShockFishShop
+	url = https://github.com/UnrealMultiple/TShockFishShop.git
+[submodule "src/Submodules/TShockWorldModify"]
+	path = src/Submodules/TShockWorldModify
+	url = https://github.com/UnrealMultiple/TShockWorldModify.git
+[submodule "src/Submodules/TShockPlayerManager"]
+	path = src/Submodules/TShockPlayerManager
+	url = https://github.com/UnrealMultiple/TShockPlayerManager.git
diff --git a/Plugins.json b/Plugins.json
@@ -13,6 +13,13 @@
     "Description": "Yet another misc plugin for TShock",
     "Path": "Chireiden.TShock.Omni.dll"
   },
+  {
+    "Name": "Crossplay",
+    "Version": "2.2",
+    "Author": "Moneylover3246",
+    "Description": "Enables crossplay for terraria",
+    "Path": "Crossplay.dll"
+  },
   {
     "Name": "[放置更多晶塔] AdditionalPylons",
     "Version": "1.0.3",
@@ -36,7 +43,7 @@
   },
   {
     "Name": "超进度限制",
-    "Version": "1.0.0.1",
+    "Version": "1.0.0.2",
     "Author": "少司命 & 恋恋魔改三合一",
     "Description": "根据进度限制",
     "Path": "ProgressRestrict.dll"
@@ -155,7 +162,7 @@
   },
   {
     "Name": "音乐播放器",
-    "Version": "1.0.2",
+    "Version": "1.0.3",
     "Author": "Olink，Cjx适配，肝帝熙恩修改, yu大改",
     "Description": "一个简单的音乐播放插件.",
     "Path": "MusicPlayer.dll"
@@ -211,7 +218,7 @@
   },
   {
     "Name": "AutoPluginManager",
-    "Version": "2.0.1.5",
+    "Version": "2.0.1.6",
     "Author": "少司命，Cai",
     "Description": "自动更新你的插件！",
     "Path": "AutoPluginManager.dll"
@@ -274,7 +281,7 @@
   },
   {
     "Name": "CaiBotPlugin",
-    "Version": "2024.9.8.1",
+    "Version": "2024.9.17.1",
     "Author": "Cai,羽学",
     "Description": "CaiBot机器人的适配插件",
     "Path": "CaiBot.dll"
@@ -330,11 +337,18 @@
   },
   {
     "Name": "ChestRestore",
-    "Version": "1.0.2",
-    "Author": "Cjx修改，肝帝熙恩简单修改",
+    "Version": "1.0.3",
+    "Author": "Cjx重构 | 肝帝熙恩简单修改",
     "Description": "无限宝箱插件",
     "Path": "ChestRestore.dll"
   },
+  {
+    "Name": "Chireiden.TShock.Omni.Misc 3c758322fb",
+    "Version": "0.0.186.0",
+    "Author": "SGKoishi",
+    "Description": "Yet another misc plugin for TShock - the miscellaneous part",
+    "Path": "Chireiden.TShock.Omni.Misc.dll"
+  },
   {
     "Name": "CNPCShop",
     "Version": "1.0.0",
@@ -482,6 +496,13 @@
     "Description": "一个指令帮助小白给初始服务器添加缺失的权限，还可以批量添删权限",
     "Path": "Ezperm.dll"
   },
+  {
+    "Name": "FishShop",
+    "Version": "1.4.4.0",
+    "Author": "hufang360",
+    "Description": "鱼店",
+    "Path": "FishShop.dll"
+  },
   {
     "Name": "GenerateMap",
     "Version": "1.0.1",
@@ -552,6 +573,13 @@
     "Description": "允许为玩家单独设置权限.",
     "Path": "PersonalPermission.dll"
   },
+  {
+    "Name": "PlayerManager",
+    "Version": "1.3.4.0",
+    "Author": "hufang360",
+    "Description": "玩家管理",
+    "Path": "PlayerManager.dll"
+  },
   {
     "Name": "ProgressControl",
     "Version": "1.0.0.8",
@@ -685,6 +713,13 @@
     "Description": "VeinMiner by Megghy 适用于 TShock 5.2 支持！",
     "Path": "VeinMiner.dll"
   },
+  {
+    "Name": "WorldModify",
+    "Version": "1.0.0.0",
+    "Author": "hufang360",
+    "Description": "简易的世界修改器",
+    "Path": "WorldModify.dll"
+  },
   {
     "Name": "ZHIPlayerManager",
     "Version": "1.0.0.7",
@@ -701,7 +736,7 @@
   },
   {
     "Name": "高尔夫奖励",
-    "Version": "1.0.7",
+    "Version": "1.0.8",
     "Author": "GK 阁下 由 鸽子 定制，肝帝熙恩更新适配1449",
     "Description": "将高尔夫打入球洞会得到奖励.",
     "Path": "GolfRewards.dll"
@@ -757,7 +792,7 @@
   },
   {
     "Name": "中文Wiki语言包加载器",
-    "Version": "1.2.0.0",
+    "Version": "2024.9.16.1",
     "Author": "Cai",
     "Description": "加载Wiki语言包",
     "Path": "WikiLangPackLoader.dll"