mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-16 07:24:53 +09:00
#61 Completed chunkStore for now, time to work on filling it
This commit is contained in:
1 parent
e2a795528f
commit
cdddfe6e30
2 files changed
+59
-21
No files matched your search
+36
-15
@@ -1,8 +1,9 @@
|
||||
var mkdirp = require("mkdirp-promise");
|
||||
var mkdirpSync = require("mkdirp").sync;
|
||||
var fs = require("fs");
|
||||
var objectOps = require("./objectOps");
|
||||
|
||||
let allowLogging = true;
|
||||
let allowLogging = false;
|
||||
let log = string => (allowLogging)? console.log(string):""
|
||||
|
||||
module.exports = class chunkStore {
|
||||
@@ -14,12 +15,13 @@ module.exports = class chunkStore {
|
||||
}
|
||||
setEntity(x, y, newEntity){
|
||||
return new Promise((resolve, reject) => {
|
||||
localX = Math.round(x % this.chunkSize);
|
||||
var localX = Math.round(x % this.chunkSize);
|
||||
x = Math.floor(Math.round(x)/this.chunkSize);
|
||||
localY = Math.round(y % this.chunkSize);
|
||||
var localY = Math.round(y % this.chunkSize);
|
||||
y = Math.floor(Math.round(y)/this.chunkSize);
|
||||
|
||||
this.getChunk(x,y).then(chunk => {
|
||||
log("Setentity")
|
||||
if(!chunk.dataObject[localX]) chunk.dataObject[localX] = {};
|
||||
if(!chunk.dataObject[localX][localY]) chunk.dataObject[localX][localY] = {};
|
||||
|
||||
@@ -30,10 +32,11 @@ module.exports = class chunkStore {
|
||||
entity.name = newEntity.name;
|
||||
} else {
|
||||
log("Deleting entry at "+localX+", "+localY);
|
||||
entity.name = undefined;
|
||||
chunk.dataObject[localX][localY] = undefined;
|
||||
}
|
||||
this.setChunk(x, y, chunk).then(()=>{
|
||||
log("Successfully saved chunk!");
|
||||
this.getChunk(x,y).then(chunk => resolve(chunk));
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -41,8 +44,8 @@ module.exports = class chunkStore {
|
||||
setChunk(x, y, chunk){
|
||||
return new Promise((resolve, reject) => {
|
||||
mkdirp(this.path+this.name+"/"+x).then(() => {
|
||||
fs.writeFile(y, JSON.stringify(chunk), function(){
|
||||
|
||||
fs.writeFile(this.path+this.name+"/"+x+"/"+y, JSON.stringify(chunk), function(){
|
||||
resolve();
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -54,19 +57,37 @@ module.exports = class chunkStore {
|
||||
dataObject: {},
|
||||
position:{x,y}, // fancy ES6 feature that generates to {x:x, y:y}
|
||||
chunkSize:this.chunkSize,
|
||||
get: function(x, y){
|
||||
if(this.dataObject[Math.round(x)] && this.dataObject[Math.round(x)][Math.round(y)]){
|
||||
return this.dataObject[Math.round(x)][Math.round(y)];
|
||||
} else {
|
||||
return undefined;
|
||||
}
|
||||
},
|
||||
};
|
||||
try {
|
||||
fs.readdir(this.path+this.name, chunkFiles => {
|
||||
log(chunkFiles);
|
||||
if(chunkFiles == undefined) {
|
||||
fs.readFile(this.path+this.name+"/"+x+"/"+y, (err, chunkFile) => {
|
||||
|
||||
if(err){
|
||||
log(err)
|
||||
resolve(chunk);
|
||||
} else {
|
||||
if(objectOps.isJSON(chunkFile)) {
|
||||
log("returned from file")
|
||||
let chunk = JSON.parse(chunkFile);
|
||||
chunk.get = function(x, y){
|
||||
if(this.dataObject[Math.round(x)] && this.dataObject[Math.round(x)][Math.round(y)]){
|
||||
return this.dataObject[Math.round(x)][Math.round(y)];
|
||||
} else {
|
||||
return undefined;
|
||||
}
|
||||
}
|
||||
resolve(chunk);
|
||||
} else {
|
||||
|
||||
log("file failed")
|
||||
resolve(chunk);
|
||||
}
|
||||
}); // add x and y values as well and we are done?
|
||||
} catch (e){
|
||||
resolve(chunk);
|
||||
}
|
||||
}
|
||||
}); // add x and y values as well and we are done?
|
||||
});
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user