Merge pull request #46 from pa733/1.17.1.01

AIP support
bedrock-dev · Jun 27, 2021 · 5dbbef8 · 5dbbef8
2 parents 7f434f7 + dbcf98d
commit 5dbbef8
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/.github/workflows/cmake-build.yml b/.github/workflows/cmake-build.yml
@@ -31,20 +31,23 @@ jobs:
       - name: MkDir
         shell: bash
         working-directory: ${{github.workspace}}
-        run: mkdir D:/out
+        run: |
+          mkdir D:/out
+          mkdir -p D:/out/plugins/trapdoor
 
       - name: Copy Output Files
         shell: bash
         working-directory: ${{github.workspace}}
         run: |
-          cp -r ./package/lang D:/out
+          cp -r ./package/lang D:/out/plugins/trapdoor
           cp ./LICENSE D:/out
           cp ./changelog.md D:/out
           cp ./README.md D:/out
           cp ./README_zh.md D:/out
           cp ./Release/*.dll D:/out
-          cp ./package/trapdoor-config.json D:/out
+          cp ./package/trapdoor-config.json D:/out/plugins/trapdoor
           cp ./trapdoor-disclaimer.md D:/out
+
       - name: package
         if: startsWith(github.event.ref, 'refs/tags/')
         shell: pwsh

diff --git a/api/language/I18nManager.cpp b/api/language/I18nManager.cpp
@@ -12,7 +12,7 @@
 namespace trapdoor {
     void I18nManager::findLanguageFile() {
         namespace fs = std::filesystem;
-        fs::path path("lang");
+        fs::path path("plugins/trapdoor/lang");
         if (!fs::exists(path)) {
             L_WARNING("can't find the language dictionary");
             return;

diff --git a/mod/dllmain.cpp b/mod/dllmain.cpp
@@ -44,14 +44,14 @@ void mod_init() {
     rmt_CreateGlobalInstance(&rmt);
     //   displayDisclaimerMessageBox(); //免责声明窗口
     initConsole();
-    trapdoor::initLogger("trapdoor.log"); //初始化日志
+    trapdoor::initLogger("plugins/trapdoor/trapdoor.log"); //初始化日志
 #ifdef  BETA
     trapdoor::setDevMode(true);
 #endif
     mod::TrapdoorMod::printCopyRightInfo(); //打印日志
     auto *mod = createBDSModInstance();
     mod->getI18NManager().initialize();
-    auto result = mod->asInstance<mod::TrapdoorMod>()->readConfigFile("trapdoor-config.json"); //读取配置文件
+    auto result = mod->asInstance<mod::TrapdoorMod>()->readConfigFile("plugins/trapdoor/trapdoor-config.json"); //读取配置文件
     if (!result) {
         L_ERROR("can not read configFile, trapdoor won't be injected");
         return;

diff --git a/mod/function/BackupHelper.cpp b/mod/function/BackupHelper.cpp
@@ -42,7 +42,7 @@ Copy-Item -Path $SourcePath -Destination "$Destination" -Recurse | Out-Null
 
         std::vector<std::string> getAllBackups(trapdoor::Actor *player) {
             namespace fs = std::filesystem;
-            fs::path backupRootPath("trapdoor-backup");
+            fs::path backupRootPath("plugins/trapdoor/trapdoor-backup");
             if (!fs::exists(backupRootPath)) {
                 trapdoor::error(player, trapdoor::LANG("backup.error.dictNotExist"));
                 return {};