Skip to content

Commit ca0abed

Browse files
committed
merge blockStates.json
1 parent e83876c commit ca0abed

File tree

4 files changed

+36
-28
lines changed

4 files changed

+36
-28
lines changed

lib/blocksModelsMerger.js

Lines changed: 0 additions & 26 deletions
This file was deleted.

lib/merger.js

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
const fs = require('fs')
2+
const path = require('path')
3+
4+
function merger (inputPath, buildPath) {
5+
const P = path.join(__dirname, inputPath)
6+
console.log(P)
7+
const result = {}
8+
fs.readdir(P, (_err, files) => {
9+
let totalImages = 0
10+
files.forEach((file) => {
11+
totalImages += 1
12+
})
13+
let loadedImages = 0
14+
files.forEach((file) => {
15+
const name = file.substr(0, file.length - 5)
16+
const filePath = path.join(P, file)
17+
fs.readFile(filePath, (err, data) => {
18+
loadedImages += 1
19+
if (err) throw err
20+
data = JSON.parse(data)
21+
result[name] = data
22+
if (loadedImages === totalImages) {
23+
fs.writeFileSync(path.join(__dirname, buildPath), JSON.stringify(result, null, 4))
24+
}
25+
})
26+
})
27+
})
28+
}
29+
merger('../assets/pack/assets/minecraft/models/block', '../src/assets/blocks/models.json')
30+
merger('../assets/pack/assets/minecraft/blockstates', '../src/assets/blocks/blockStates.json')

lib/prebuild.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const fs = require('fs')
44
const pBlock = require('prismarine-block')(version)
55
const AtlasCreator = require('./atlasCreator')
66
const path = require('path')
7-
require('./blocksModelsMerger.js')
7+
require('./merger.js')
88

99
new AtlasCreator({
1010
pref: 'items',

src/assets/assetLoader.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,12 @@
4343
"path":"assets/config.json",
4444
"type":"text"
4545
},
46-
"models":{
46+
"blocksModels":{
4747
"path":"assets/blocks/models.json",
4848
"type":"text"
49+
},
50+
"blocksStates":{
51+
"path":"assets/blocks/blockStates.json",
52+
"type":"text"
4953
}
5054
}

0 commit comments

Comments
 (0)