Merge pull request #13 from LucasDower/atlas-integration

Atlas integration

.gitignore

@@ -3,4 +3,6 @@ package-lock.json
 ObjToSchematic-win32-x64
 /resources/*.obj
 /resources/*.mtl
-/dist
+/dist
+/tools/blocks
+/tools/models

README.md

@@ -34,7 +34,7 @@ A tool to convert .obj model files into Minecraft Schematics or [Litematica](htt
 * Alpha support
   * Alpha texture maps
   * Transparent blocks
-* ⌛ Support for non-uniform block models (i.e. not all sides have same texture e.g. Oak Log, Crafting Table) (see [atlas-integration](https://github.com/LucasDower/ObjToSchematic/tree/atlas-integration))
+* ✔️ **Support for non-uniform block models** (i.e. not all sides have same texture e.g. Oak Log, Crafting Table)
 * ⌛ UI Redesign (use an actual UI framework) (see [redesign](https://github.com/LucasDower/ObjToSchematic/tree/redesign))
   * Block palette (choose blocks to export with)
   * Options for toggling fallable blocks
@@ -62,6 +62,8 @@ You can either download the [latest release](https://github.com/LucasDower/ObjTo
 * Run `npm install`.
 * Run `npm start`.
 
+Support for choosing the block palette is not yet supported. Instead, you can rebuild blocks.json with `npm run-script atlas` using only the blocks you want to export with. This also means you can use custom texture packs to get more accurate block-colour matching.
+
 
 ![](https://i.imgur.com/BTj9gAx.gif)
 

package.json

@@ -9,6 +9,7 @@
   "scripts": {
     "build": "tsc",
     "start": "npm run build && electron ./dist/main.js",
+    "atlas": "npx ts-node tools/build-atlas.ts",
     "export": "electron-packager . ObjToSchematic --platform=win32 --arch=x64"
   },
   "repository": {
@@ -25,8 +26,10 @@
     "@types/bootstrap": "^5.1.1",
     "@types/jquery": "^3.5.6",
     "@types/pngjs": "^6.0.1",
+    "chalk": "^4.1.2",
     "electron": "^13.1.4",
     "electron-packager": "^15.2.0",
+    "images": "^3.2.3",
     "ts-node": "^10.1.0",
     "typescript": "^4.3.5"
   },