diff --git a/.gitignore b/.gitignore index 6557809..db6dee8 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,9 @@ game-server/*.sqlite game-server/*.sqlite-shm game-server/*.sqlite-wal +database.sqlite +database.sqlite-shm +database.sqlite-wal **/.env **/.env.local **/.env.development.local @@ -21,4 +24,4 @@ Thumbs.db client/dist/ client/build/ -game-server-* \ No newline at end of file +game-server-* diff --git a/src/config/config.js b/src/config/config.js index d946a57..293877e 100644 --- a/src/config/config.js +++ b/src/config/config.js @@ -9,6 +9,7 @@ const config = { serverRegion: process.env.REGION, dbUri: process.env.DB_URI || "local", host: process.env.HOST, + datapackSrc: process.env.DATAPACK_SRC, }; module.exports = config; diff --git a/src/game/DatapackLoader.js b/src/game/DatapackLoader.js index ffb1eec..697401b 100644 --- a/src/game/DatapackLoader.js +++ b/src/game/DatapackLoader.js @@ -71,7 +71,7 @@ class DatapackLoader { }); console.log( - `🚀 Registry Ready: ${this.registry.items.size} Items, ${this.registry.dungeons.size} Dungeons, ${this.registry.quests.size} Quests, ${this.registry.languages.size} Langs, ${manifestCount} Manifests ${this.registry.rooms.size} Rooms`, + `🚀 Registry Ready: ${this.registry.recipes.size} Reciepes, ${this.registry.items.size} Items, ${this.registry.dungeons.size} Dungeons, ${this.registry.quests.size} Quests, ${this.registry.languages.size} Langs, ${manifestCount} Manifests ${this.registry.rooms.size} Rooms`, ); } @@ -156,6 +156,7 @@ class DatapackLoader { case "armour": case "plating": case "materials": + case "equipment": case "weapons": data.type = typeKey; this.registry.items.set(fullId, data); diff --git a/src/index.js b/src/index.js index da54b17..c520624 100644 --- a/src/index.js +++ b/src/index.js @@ -79,7 +79,7 @@ const sendHeartbeat = async () => { server.listen(config.port, async () => { try { - const datapacksPath = path.join(__dirname, "../datapacks"); + const datapacksPath = config.datapackSrc; DatapackLoader.init(datapacksPath, io); await sequelize.initDatabase(); initSockets(io);