sapdon 2.0.2 → 2.1.0

package/src/cli/build.js

@@ -1,211 +1,211 @@
-import path from 'path';
-import { checkPath, readFile, generateUUID ,saveFile,copyFileSync, copyFolder} from "./utils.js"
-import { loadAndExecuteMod } from './load.js';
-
-import { 
-    AddonManifestHeader, 
-    AddonManifestModule, 
-    AddonManifest, 
-    AddonManifestMetadata
-} from '../core/addon/manifest.js';
-
-import { fileURLToPath } from 'url';
-
-// 获取当前文件的目录路径
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-
-//读取配置文件
-const pathConfig = JSON.parse(readFile(path.join(__dirname,"./build.config")));
-
-//构建项目
-export const buildProject = (projectPath,projectName) => {
-   console.log("开始构建项目");
-   console.log("项目路径：" + projectPath);
-    //检查项目是否存在
-    if(checkPath(projectPath)) {
-        console.log("项目不存在");
-        return;
-    }
-    //检查项目是否有build.config文件
-    if(checkPath(path.join(projectPath,"build.config"))) {
-        console.log("项目没有build.config文件");
-        return;
-    }
-
-    //读取build.config文件
-    const buildConfigPath = path.join(projectPath,"build.config");
-    const buildConfig = JSON.parse(readFile(buildConfigPath));
-    //console.log(buildConfig);
-
-    //读取mod.info文件
-    const modInfoPath = path.join(projectPath,"mod.info");
-    const modInfo = JSON.parse(readFile(modInfoPath));
-    const min_engine_version = versionStringToArray(modInfo.min_engine_version);
-
-    const buildDirPath = path.join(projectPath,buildConfig.defaultConfig.buildDir);
-
-    const buildBehDirPath = path.join(buildDirPath,`${projectName}_BP/`);
-    const buildResDirPath = path.join(buildDirPath,`${projectName}_RP/`);
-    //生成manifest.json文件
-    //判断manifest.json是否已经生成过了，生成过了就不用生成
-    const manifestPath = path.join(buildBehDirPath,"manifest.json");
-    if(checkPath(manifestPath)){
-        const behManifest = generateBehManifest(
-            modInfo.name,
-            modInfo.description,
-            modInfo.version,
-            {
-                min_engine_version:min_engine_version,
-            },
-            buildConfig.defaultConfig.dependencies,
-            buildConfig.defaultConfig.scriptEntry
-        );
-    
-        const resManifest = generateResManifest(
-            modInfo.name,
-            modInfo.description,
-            modInfo.version,
-            {
-                min_engine_version:min_engine_version,
-            },
-            []
-        );
-        
-       //BP
-        saveFile(path.join(buildBehDirPath,"manifest.json"),behManifest);
-        //RP
-        saveFile(path.join(buildResDirPath,"manifest.json"),resManifest); 
-    }
-
-    //复制pack_icon.png
-    const packIconPath = path.join(projectPath,"pack_icon.png");
-    
-    copyFileSync(packIconPath,path.join(buildBehDirPath,"pack_icon.png"));
-    copyFileSync(packIconPath,path.join(buildResDirPath,"pack_icon.png"));
-
-    //复制文件夹
-    const resources = buildConfig.resources;
-    resources.forEach(element => {
-        const sourcePath = path.join(projectPath,element.path);
-        copyFolder(sourcePath,buildResDirPath);
-    });
-
-    //复制scripts文件夹
-    const scripts = buildConfig.scripts;
-    const scriptPath = path.join(buildBehDirPath,"scripts/");
-    scripts.forEach(element => {
-        const sourcePath = path.join(projectPath,element.path);
-        copyFolder(sourcePath,scriptPath);
-    });
-
-    
-
-    //只有当buildMode为development时才加载用户modjs文件
-    if(buildConfig.defaultConfig.buildMode === "development"){
-         //动态加载用户modjs文件
-        loadAndExecuteMod(path.join(projectPath,buildConfig.defaultConfig.buildEntry),buildDirPath,projectName);
-    }
-   
-    //延迟1s
-    setTimeout(()=>{
-        //将编译好的文件夹拷贝至mc
-        //console.log(path.join(pathConfig.mojangPath,`development_behavior_packs/${projectName}_BP/`));
-        copyFolder(buildBehDirPath,path.join(pathConfig.mojangPath,"development_behavior_packs/",`${projectName}_BP/`));
-        copyFolder(buildResDirPath,path.join(pathConfig.mojangPath,"development_resource_packs/",`${projectName}_RP/`));
-    },1000);
-
-}
-
-function versionStringToArray(versionString) {
-  // 使用 split 方法将字符串按 '.' 分割成数组
-  const parts = versionString.split('.');
-
-  // 使用 map 方法将每个部分转换为数字
-  const versionArray = parts.map(part => Number(part));
-
-  return versionArray;
-}
-
-const generateBehManifest = (name, description, version, options = {},dependencies = [],entry) => {
-    console.log("开始生成behavior_packs/manifest.json")
-    console.log("Entry:",entry)
-    const header = new AddonManifestHeader(
-        (name+"_BP"),
-        description,
-        versionStringToArray(version),
-        generateUUID(),
-        options
-    );
-    const module = new AddonManifestModule(
-        "行为模块",
-        "data",
-        generateUUID(),
-        versionStringToArray(version)
-    );
-    const script_module = new AddonManifestModule(
-        "脚本模块",
-        "script",
-        generateUUID(),
-        versionStringToArray(version)
-    );
-    if(entry){script_module.entry = entry;}
-
-    const metadata = new AddonManifestMetadata(
-        ["@sapdon"],
-        "MIT",
-        {
-            "sapdon":["1.0.0"]
-        },
-        "addon",
-        "https://github.com/junjun260/sapdon"
-    );
-    
-    const manifest = new AddonManifest(
-        2,//格式版本
-        header,
-        [module,script_module],
-        dependencies,
-        null,
-        metadata
-    );
-
-    return JSON.stringify(manifest, null, 2);
-}
-
-const generateResManifest = (name, description, version,options = {},dependencies = []) => {
-    const header = new AddonManifestHeader(
-        (name+"_RP"),
-        description,
-        versionStringToArray(version),
-        generateUUID(),
-        options
-    );
-    const module = new AddonManifestModule(
-        "资源模块",
-        "resources",
-        generateUUID(),
-        versionStringToArray(version)
-    );
-
-    const metadata = new AddonManifestMetadata(
-        ["@sapdon"],
-        "MIT",
-        {
-            "sapdon":["1.0.0"]
-        },
-        "addon",
-        "https://github.com/junjun260/sapdon"
-    );
-
-    const manifest = new AddonManifest(
-        2,//格式版本
-        header,
-        [module],
-        [],
-        null,
-        metadata
-    );
-
-    return JSON.stringify(manifest, null, 2);
+import path from 'path';
+import { checkPath, readFile, generateUUID ,saveFile,copyFileSync, copyFolder} from "./utils.js"
+import { loadAndExecuteMod } from './load.js';
+
+import { 
+    AddonManifestHeader, 
+    AddonManifestModule, 
+    AddonManifest, 
+    AddonManifestMetadata
+} from '../core/addon/manifest.js';
+
+import { fileURLToPath } from 'url';
+
+// 获取当前文件的目录路径
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+//读取配置文件
+const pathConfig = JSON.parse(readFile(path.join(__dirname,"./build.config")));
+
+//构建项目
+export const buildProject = (projectPath,projectName) => {
+   console.log("开始构建项目");
+   console.log("项目路径：" + projectPath);
+    //检查项目是否存在
+    if(checkPath(projectPath)) {
+        console.log("项目不存在");
+        return;
+    }
+    //检查项目是否有build.config文件
+    if(checkPath(path.join(projectPath,"build.config"))) {
+        console.log("项目没有build.config文件");
+        return;
+    }
+
+    //读取build.config文件
+    const buildConfigPath = path.join(projectPath,"build.config");
+    const buildConfig = JSON.parse(readFile(buildConfigPath));
+    //console.log(buildConfig);
+
+    //读取mod.info文件
+    const modInfoPath = path.join(projectPath,"mod.info");
+    const modInfo = JSON.parse(readFile(modInfoPath));
+    const min_engine_version = versionStringToArray(modInfo.min_engine_version);
+
+    const buildDirPath = path.join(projectPath,buildConfig.defaultConfig.buildDir);
+
+    const buildBehDirPath = path.join(buildDirPath,`${projectName}_BP/`);
+    const buildResDirPath = path.join(buildDirPath,`${projectName}_RP/`);
+    //生成manifest.json文件
+    //判断manifest.json是否已经生成过了，生成过了就不用生成
+    const manifestPath = path.join(buildBehDirPath,"manifest.json");
+    if(checkPath(manifestPath)){
+        const behManifest = generateBehManifest(
+            modInfo.name,
+            modInfo.description,
+            modInfo.version,
+            {
+                min_engine_version:min_engine_version,
+            },
+            buildConfig.defaultConfig.dependencies,
+            buildConfig.defaultConfig.scriptEntry
+        );
+    
+        const resManifest = generateResManifest(
+            modInfo.name,
+            modInfo.description,
+            modInfo.version,
+            {
+                min_engine_version:min_engine_version,
+            },
+            []
+        );
+        
+       //BP
+        saveFile(path.join(buildBehDirPath,"manifest.json"),behManifest);
+        //RP
+        saveFile(path.join(buildResDirPath,"manifest.json"),resManifest); 
+    }
+
+    //复制pack_icon.png
+    const packIconPath = path.join(projectPath,"pack_icon.png");
+    
+    copyFileSync(packIconPath,path.join(buildBehDirPath,"pack_icon.png"));
+    copyFileSync(packIconPath,path.join(buildResDirPath,"pack_icon.png"));
+
+    //复制文件夹
+    const resources = buildConfig.resources;
+    resources.forEach(element => {
+        const sourcePath = path.join(projectPath,element.path);
+        copyFolder(sourcePath,buildResDirPath);
+    });
+
+    //复制scripts文件夹
+    const scripts = buildConfig.scripts;
+    const scriptPath = path.join(buildBehDirPath,"scripts/");
+    scripts.forEach(element => {
+        const sourcePath = path.join(projectPath,element.path);
+        copyFolder(sourcePath,scriptPath);
+    });
+
+    
+
+    //只有当buildMode为development时才加载用户modjs文件
+    if(buildConfig.defaultConfig.buildMode === "development"){
+         //动态加载用户modjs文件
+        loadAndExecuteMod(path.join(projectPath,buildConfig.defaultConfig.buildEntry),buildDirPath,projectName);
+    }
+   
+    //延迟1s
+    setTimeout(()=>{
+        //将编译好的文件夹拷贝至mc
+        //console.log(path.join(pathConfig.mojangPath,`development_behavior_packs/${projectName}_BP/`));
+        copyFolder(buildBehDirPath,path.join(pathConfig.mojangPath,"development_behavior_packs/",`${projectName}_BP/`));
+        copyFolder(buildResDirPath,path.join(pathConfig.mojangPath,"development_resource_packs/",`${projectName}_RP/`));
+    },1000);
+
+}
+
+function versionStringToArray(versionString) {
+  // 使用 split 方法将字符串按 '.' 分割成数组
+  const parts = versionString.split('.');
+
+  // 使用 map 方法将每个部分转换为数字
+  const versionArray = parts.map(part => Number(part));
+
+  return versionArray;
+}
+
+const generateBehManifest = (name, description, version, options = {},dependencies = [],entry) => {
+    console.log("开始生成behavior_packs/manifest.json")
+    console.log("Entry:",entry)
+    const header = new AddonManifestHeader(
+        (name+"_BP"),
+        description,
+        versionStringToArray(version),
+        generateUUID(),
+        options
+    );
+    const module = new AddonManifestModule(
+        "行为模块",
+        "data",
+        generateUUID(),
+        versionStringToArray(version)
+    );
+    const script_module = new AddonManifestModule(
+        "脚本模块",
+        "script",
+        generateUUID(),
+        versionStringToArray(version)
+    );
+    if(entry){script_module.entry = entry;}
+
+    const metadata = new AddonManifestMetadata(
+        ["@sapdon"],
+        "MIT",
+        {
+            "sapdon":["2.0.1"]
+        },
+        "addon",
+        "https://github.com/Meteage/sapdon"
+    );
+    
+    const manifest = new AddonManifest(
+        2,//格式版本
+        header,
+        [module,script_module],
+        dependencies,
+        null,
+        metadata
+    );
+
+    return JSON.stringify(manifest, null, 2);
+}
+
+const generateResManifest = (name, description, version,options = {},dependencies = []) => {
+    const header = new AddonManifestHeader(
+        (name+"_RP"),
+        description,
+        versionStringToArray(version),
+        generateUUID(),
+        options
+    );
+    const module = new AddonManifestModule(
+        "资源模块",
+        "resources",
+        generateUUID(),
+        versionStringToArray(version)
+    );
+
+    const metadata = new AddonManifestMetadata(
+        ["@sapdon"],
+        "MIT",
+        {
+            "sapdon":["2.0.1"]
+        },
+        "addon",
+        "https://github.com/Meteage/sapdon"
+    );
+
+    const manifest = new AddonManifest(
+        2,//格式版本
+        header,
+        [module],
+        [],
+        null,
+        metadata
+    );
+
+    return JSON.stringify(manifest, null, 2);
 }

package/src/cli/load.js

@@ -1,113 +1,117 @@
-import path from "path";
-import { pathToFileURL } from "url";
-import { saveFile } from "./utils.js";
-import { GRegistry } from "../core/registry.js";
-import { generateBlockTextureJson, generateItemTextureJson} from "./tools/textureSet.js";
-import { FlipbookTextures, ItemTextureManager, terrainTextureManager } from "../core/texture.js";
-
-import { ServerUISystem } from "../core/ui/registry/ServerUISystem.js";
-import { ServerFromSystem, updateServerFormSystem } from "../core/ui/systems/server_form.js";
-
-/**
- * 处理 blocks.json 数据
- * @param {Object} data blocks.json 数据
- * @returns {Object} 处理后的 blocks 数据
- */
-const processBlocksData = (data) => {
-    const textures_arr = data.textures;
-
-    // 检查 textures 数组长度
-    if (textures_arr.length !== 6) {
-        console.warn(`blocks.json 的 textures 数组长度不为 6，实际长度: ${textures_arr.length}`);
-        return {};
-    }
-
-    // 构建 blocks 数据
-    const blocks = {};
-    blocks[data.identifier] = {
-        textures: {
-            up: textures_arr[0],
-            down: textures_arr[1],
-            east: textures_arr[2],
-            west: textures_arr[3],
-            south: textures_arr[4],
-            north: textures_arr[5]
-        }
-    };
-
-    return blocks;
-};
-
-/**
- * 加载并执行模组文件
- * @param {string} modPath 模组文件路径
- * @param {string} buildPath 构建目录路径
- */
-export const loadAndExecuteMod = async (modPath, buildPath,projectName) => {
-    try {
-        // 将 modPath 解析为绝对路径
-        const absoluteModPath = path.resolve(modPath);
-
-        // 将路径转换为 file:// URL
-        const fileUrl = pathToFileURL(absoluteModPath).href;
-
-        // 动态加载 JavaScript 文件
-        await import(fileUrl);
-
-        const buildBehDirPath = path.join(buildPath,`${projectName}_BP/`);
-        const buildResDirPath = path.join(buildPath,`${projectName}_RP/`);
-
-        // 初始化 blocks.json 数据
-        const blocksJsonPath = path.join(buildPath, `${projectName}_RP`,"blocks.json");
-        const blocks = {"format_version": "1.20.20"};
-
-        //生成item_texture.json
-        const item_texture_dir = path.join(buildResDirPath,"textures/items");
-        const item_texture_json_path = path.join(buildResDirPath,"textures/item_texture.json")
-        generateItemTextureJson(item_texture_dir,item_texture_json_path,projectName,ItemTextureManager.getItemTextures());
-
-         //生成terrain_texture.json
-        const terrain_texture_dir = path.join(buildResDirPath,"textures/blocks")
-        const terrain_texture_json_path = path.join(buildResDirPath,"textures/terrain_texture.json")
-        generateBlockTextureJson(terrain_texture_dir,terrain_texture_json_path,projectName,terrainTextureManager.getTerrainTextures());
-
-        //生成flipbook_textures.json
-        const flipbook_textures_path = path.join(buildResDirPath,"textures/flipbook_textures.json")
-        saveFile(flipbook_textures_path,JSON.stringify(FlipbookTextures.flipbook_textures,null,2));
-
-        //ui server_form
-        
-        GRegistry.register(ServerFromSystem.name,"resource",ServerFromSystem.path,ServerFromSystem);
-        // 从全局注册表中获取数据
-        const dataList = GRegistry.getDataList();
-        //console.log("dataList:", dataList);
-
-        // 遍历数据并保存到相应的目录
-        dataList.forEach(({ name, root, path: dataPath, data }) => {
-            // 处理 blocks.json 数据
-            if (dataPath === "blocks/") {
-                const processedBlocks = processBlocksData(data);
-                Object.assign(blocks, processedBlocks);
-            }
-
-            // 根据数据类型确定根目录
-            const rootPath = root === "behavior" ?  `${projectName}_BP`: `${projectName}_RP`;
-            const buildRootPath = path.join(buildPath, rootPath);
-
-            // 拼接文件路径
-            const filePath = path.join(buildRootPath, dataPath, `${name}.json`);
-
-            // 保存文件
-            saveFile(filePath, JSON.stringify(data.toJson(), null, 2));
-        });
-
-        // 保存 blocks.json
-        console.log("保存 blocks.json 文件:", blocksJsonPath);
-        saveFile(blocksJsonPath, JSON.stringify(blocks, null, 2));
-
-        console.log(`已加载并执行 ${modPath} 文件！`);
-    } catch (err) {
-        console.error(`加载或执行 ${modPath} 失败：${err.message}`);
-        console.error(err.stack); // 打印堆栈跟踪以便调试
-    }
+import path from "path";
+import { pathToFileURL } from "url";
+import { saveFile } from "./utils.js";
+import { GRegistry } from "../core/registry.js";
+import { generateBlockTextureJson, generateItemTextureJson} from "./tools/textureSet.js";
+import { FlipbookTextures, ItemTextureManager, terrainTextureManager } from "../core/texture.js";
+
+import { UISystemRegistry } from "../core/ui/registry/UISystemRegistry.js";
+
+/**
+ * 处理 blocks.json 数据
+ * @param {Object} data blocks.json 数据
+ * @returns {Object} 处理后的 blocks 数据
+ */
+const processBlocksData = (data) => {
+    const textures_arr = data.textures;
+
+    // 检查 textures 数组长度
+    if (textures_arr.length !== 6) {
+        console.warn(`blocks.json 的 textures 数组长度不为 6，实际长度: ${textures_arr.length}`);
+        return {};
+    }
+
+    // 构建 blocks 数据
+    const blocks = {};
+    blocks[data.identifier] = {
+        textures: {
+            up: textures_arr[0],
+            down: textures_arr[1],
+            east: textures_arr[2],
+            west: textures_arr[3],
+            south: textures_arr[4],
+            north: textures_arr[5]
+        }
+    };
+
+    return blocks;
+};
+
+/**
+ * 加载并执行模组文件
+ * @param {string} modPath 模组文件路径
+ * @param {string} buildPath 构建目录路径
+ */
+export const loadAndExecuteMod = async (modPath, buildPath,projectName) => {
+    try {
+        // 将 modPath 解析为绝对路径
+        const absoluteModPath = path.resolve(modPath);
+
+        // 将路径转换为 file:// URL
+        const fileUrl = pathToFileURL(absoluteModPath).href;
+
+        // 动态加载 JavaScript 文件
+        await import(fileUrl);
+
+        const buildBehDirPath = path.join(buildPath,`${projectName}_BP/`);
+        const buildResDirPath = path.join(buildPath,`${projectName}_RP/`);
+
+        // 初始化 blocks.json 数据
+        const blocksJsonPath = path.join(buildPath, `${projectName}_RP`,"blocks.json");
+        const blocks = {"format_version": "1.20.20"};
+
+        //生成item_texture.json
+        const item_texture_dir = path.join(buildResDirPath,"textures/items");
+        const item_texture_json_path = path.join(buildResDirPath,"textures/item_texture.json")
+        generateItemTextureJson(item_texture_dir,item_texture_json_path,projectName,ItemTextureManager.getItemTextures());
+
+         //生成terrain_texture.json
+        const terrain_texture_dir = path.join(buildResDirPath,"textures/blocks")
+        const terrain_texture_json_path = path.join(buildResDirPath,"textures/terrain_texture.json")
+        generateBlockTextureJson(terrain_texture_dir,terrain_texture_json_path,projectName,terrainTextureManager.getTerrainTextures());
+
+        //生成flipbook_textures.json
+        const flipbook_textures_path = path.join(buildResDirPath,"textures/flipbook_textures.json")
+        saveFile(flipbook_textures_path,JSON.stringify(FlipbookTextures.flipbook_textures,null,2));
+
+        //_ui_defs.json
+        const ui_def = UISystemRegistry.getUIdefList();
+        saveFile(path.join(buildResDirPath,"ui/_ui_defs.json"),JSON.stringify({"ui_defs": ui_def},null,2));
+        
+        UISystemRegistry.getUISystemList().forEach((ui_system)=>{
+            saveFile(path.join(buildResDirPath,ui_system.path,`${ui_system.name}.json`),JSON.stringify(ui_system.toJson(),null,2))
+        })
+        
+        // 从全局注册表中获取数据
+        const dataList = GRegistry.getDataList();
+        //console.log("dataList:", dataList);
+
+        // 遍历数据并保存到相应的目录
+        dataList.forEach(({ name, root, path: dataPath, data }) => {
+            // 处理 blocks.json 数据
+            if (dataPath === "blocks/") {
+                const processedBlocks = processBlocksData(data);
+                Object.assign(blocks, processedBlocks);
+            }
+
+            // 根据数据类型确定根目录
+            const rootPath = root === "behavior" ?  `${projectName}_BP`: `${projectName}_RP`;
+            const buildRootPath = path.join(buildPath, rootPath);
+
+            // 拼接文件路径
+            const filePath = path.join(buildRootPath, dataPath, `${name}.json`);
+
+            // 保存文件
+            saveFile(filePath, JSON.stringify(data.toJson(), null, 2));
+        });
+
+        // 保存 blocks.json
+        console.log("保存 blocks.json 文件:", blocksJsonPath);
+        saveFile(blocksJsonPath, JSON.stringify(blocks, null, 2));
+
+        console.log(`已加载并执行 ${modPath} 文件！`);
+    } catch (err) {
+        console.error(`加载或执行 ${modPath} 失败：${err.message}`);
+        console.error(err.stack); // 打印堆栈跟踪以便调试
+    }
 };