From b26fe51175c45b9fa943727c705ea9b8d0afc771 Mon Sep 17 00:00:00 2001 From: cha0s Date: Fri, 5 Jan 2024 19:26:23 -0600 Subject: [PATCH] refactor: mixin --- packages/app/src/client/index.js | 2 +- packages/app/src/hooks/use-room.js | 2 +- packages/bootstrap/src/server.js | 2 +- packages/combat/src/traits/harmful.js | 2 +- packages/combat/src/traits/vulnerable.js | 4 ++-- packages/core/src/electron/server.js | 2 +- packages/core/src/traits/item.js | 2 +- packages/farm/src/traits/plant.js | 2 +- packages/farm/src/traits/tool.js | 2 +- packages/inventory/src/traits/receptacle.js | 4 ++-- packages/universe/src/server/gen/alpha.js | 2 +- packages/universe/src/server/gen/player-entity.js | 2 +- packages/universe/src/server/gen/player-room.js | 2 +- packages/universe/src/server/universe/index.js | 8 ++++---- 14 files changed, 19 insertions(+), 19 deletions(-) diff --git a/packages/app/src/client/index.js b/packages/app/src/client/index.js index 1462c7b..8299953 100644 --- a/packages/app/src/client/index.js +++ b/packages/app/src/client/index.js @@ -6,6 +6,6 @@ export const hooks = { const Synchronizer = Receiver(flecks); const synchronizer = new Synchronizer(); flecks.set('$humus/app.synchronizer', synchronizer); - synchronizer.listenTo(flecks.get('$flecks/socket.socket')); + synchronizer.listenTo(flecks.socket.client); }, }; diff --git a/packages/app/src/hooks/use-room.js b/packages/app/src/hooks/use-room.js index a6cf955..746801d 100644 --- a/packages/app/src/hooks/use-room.js +++ b/packages/app/src/hooks/use-room.js @@ -29,7 +29,7 @@ export default () => { return undefined; } const onCreated = (created) => { - const {Room} = flecks.get('$avocado/resource.resources'); + const {Room} = flecks.avocado.Resources; switch (created.constructor.resourceId) { // Track room. case Room.resourceId: { diff --git a/packages/bootstrap/src/server.js b/packages/bootstrap/src/server.js index d53c083..834b9c7 100644 --- a/packages/bootstrap/src/server.js +++ b/packages/bootstrap/src/server.js @@ -3,7 +3,7 @@ export const hooks = { // if ('production' === NODE_ENV) { // return; // } - const {User} = flecks.get('$flecks/db.models'); + const {User} = flecks.db.Models; if (!await User.findOne({where: {email: 'humus@cha0s.io'}})) { const user = await User.create({ email: 'humus@cha0s.io', diff --git a/packages/combat/src/traits/harmful.js b/packages/combat/src/traits/harmful.js index f971654..c764cb9 100644 --- a/packages/combat/src/traits/harmful.js +++ b/packages/combat/src/traits/harmful.js @@ -70,7 +70,7 @@ export default (flecks) => class Harmful extends decorate(Trait) { listeners() { const listeners = { harming: async (harm, harmed) => { - const {Script} = flecks.get('$avocado/resource.resources'); + const {Script} = flecks.avocado.Resources; this.entity.addTickingPromise(Script.loadTickingPromise(this.params.harmingScript, { ...this.entity.contextOrDefault, harm, diff --git a/packages/combat/src/traits/vulnerable.js b/packages/combat/src/traits/vulnerable.js index ec73ab3..49e2584 100644 --- a/packages/combat/src/traits/vulnerable.js +++ b/packages/combat/src/traits/vulnerable.js @@ -192,7 +192,7 @@ export default (flecks) => class Vulnerable extends Trait { } interactions(harmed, harm) { - const {Script} = flecks.get('$avocado/resource.resources'); + const {Script} = flecks.avocado.Resources; const {affinity, from} = harm; const interactions = flecks.get('$humus/combat.interactions'); flatten( @@ -278,7 +278,7 @@ export default (flecks) => class Vulnerable extends Trait { }, harmed: async (harm, from) => { - const {Script} = flecks.get('$avocado/resource.resources'); + const {Script} = flecks.avocado.Resources; const script = await Script.load(this.params.harmedScript, { entity: this.entity, from, diff --git a/packages/core/src/electron/server.js b/packages/core/src/electron/server.js index 078423a..137ba08 100644 --- a/packages/core/src/electron/server.js +++ b/packages/core/src/electron/server.js @@ -17,7 +17,7 @@ export const hooks = { }, '@flecks/web/server.request.route': (flecks) => async (req, res, next) => { if (isElectron() && 0 === req.user.id) { - const {User} = flecks.get('$flecks/db.models'); + const {User} = flecks.db.Models; req.logIn(await User.findByPk(1), next); return; } diff --git a/packages/core/src/traits/item.js b/packages/core/src/traits/item.js index 1ed23ae..7351eca 100644 --- a/packages/core/src/traits/item.js +++ b/packages/core/src/traits/item.js @@ -55,7 +55,7 @@ export default (flecks) => class Item extends decorate(Trait) { use: () => { const {cooldown} = this.params; - const {Script} = flecks.get('$avocado/resource.resources'); + const {Script} = flecks.avocado.Resources; const promises = [Script.loadTickingPromise(this.params.useScript, this.entity.context)]; if (cooldown > 0) { promises.push(new Promise((resolve) => { diff --git a/packages/farm/src/traits/plant.js b/packages/farm/src/traits/plant.js index 913bacf..d23c3c0 100644 --- a/packages/farm/src/traits/plant.js +++ b/packages/farm/src/traits/plant.js @@ -65,7 +65,7 @@ export default (flecks) => class Plant extends decorate(Trait) { async load(json) { await super.load(json); - const {Script} = flecks.get('$avocado/resource.resources'); + const {Script} = flecks.avocado.Resources; const {growthCheck, growthScript} = this.params; if (growthCheck) { this.growthCheck = await Script.load(growthCheck, { diff --git a/packages/farm/src/traits/tool.js b/packages/farm/src/traits/tool.js index babf6a2..9c2f514 100644 --- a/packages/farm/src/traits/tool.js +++ b/packages/farm/src/traits/tool.js @@ -180,7 +180,7 @@ export default (flecks) => class Tool extends Trait { } this.calculateTargets(); const promises = this.$$targets.map((target) => { - const {Script} = flecks.get('$avocado/resource.resources'); + const {Script} = flecks.avocado.Resources; const context = this.createTargetContext(target); return Script.loadTickingPromise(this.params.toolScript, context); }); diff --git a/packages/inventory/src/traits/receptacle.js b/packages/inventory/src/traits/receptacle.js index db945bf..e919488 100644 --- a/packages/inventory/src/traits/receptacle.js +++ b/packages/inventory/src/traits/receptacle.js @@ -48,7 +48,7 @@ export default (flecks) => class Receptacle extends decorate(Trait) { break; } case 'TraitUpdateReceptacleItemFull': { - const {Entity} = flecks.get('$avocado/resource.resources'); + const {Entity} = flecks.avocado.Resources; this.entity.addItemToSlot(await Entity.load(packet.data.json), packet.data.slotIndex); break; } @@ -195,7 +195,7 @@ export default (flecks) => class Receptacle extends decorate(Trait) { } async load(json) { - const {Entity} = flecks.get('$avocado/resource.resources'); + const {Entity} = flecks.avocado.Resources; await super.load(json); await Promise.all(Object.entries(this.params.slots).map(async ([slotIndex, slotSpec]) => { const item = await Entity.load({extends: slotSpec.extends}); diff --git a/packages/universe/src/server/gen/alpha.js b/packages/universe/src/server/gen/alpha.js index 83d3a19..dda3db2 100644 --- a/packages/universe/src/server/gen/alpha.js +++ b/packages/universe/src/server/gen/alpha.js @@ -56,7 +56,7 @@ noiseSeed(seed); Plains.generate(); export default async (room, flecks) => { - const {Entity} = flecks.get('$avocado/resource.resources'); + const {Entity} = flecks.avocado.Resources; room.tiles[0].stampAt( [0, 0, w, h], Plains.matrix, diff --git a/packages/universe/src/server/gen/player-entity.js b/packages/universe/src/server/gen/player-entity.js index baf6a44..8b16083 100644 --- a/packages/universe/src/server/gen/player-entity.js +++ b/packages/universe/src/server/gen/player-entity.js @@ -1,5 +1,5 @@ const createPlayerEntity = async (flecks, name) => { - const {Entity} = flecks.get('$avocado/resource.resources'); + const {Entity} = flecks.avocado.Resources; const entity = await Entity.load({ extends: '/player/index.entity.json', traits: {Named: {state: {name}}}, diff --git a/packages/universe/src/server/gen/player-room.js b/packages/universe/src/server/gen/player-room.js index fa8a250..cd4c3fe 100644 --- a/packages/universe/src/server/gen/player-room.js +++ b/packages/universe/src/server/gen/player-room.js @@ -1,5 +1,5 @@ const createPlayerRoom = async (flecks) => { - const {Room} = flecks.get('$avocado/resource.resources'); + const {Room} = flecks.avocado.Resources; const room = await Room.load({extends: '/player/index.room.json'}); flecks.invoke('@humus/universe.player.room', room); return room; diff --git a/packages/universe/src/server/universe/index.js b/packages/universe/src/server/universe/index.js index 8c8f3aa..295be7b 100644 --- a/packages/universe/src/server/universe/index.js +++ b/packages/universe/src/server/universe/index.js @@ -80,7 +80,7 @@ export default class Universe { async createEntity(user) { const playerPath = join(this.$$root, 'players', `${user.id}`); - const {Entity} = this.$$flecks.get('$avocado/resource.resources'); + const {Entity} = this.$$flecks.avocado.Resources; await mkdir(playerPath, {recursive: true}); const entity = await createPlayerEntity(this.$$flecks, user.email); entity.currentRoom = `/${join('players', `${user.id}`, 'index.room.json')}`; @@ -132,7 +132,7 @@ export default class Universe { } const universe = new this(flecks, path); await universe.loadOrCreateResource(); - const {Room} = flecks.get('$avocado/resource.resources'); + const {Room} = flecks.avocado.Resources; await Promise.all( (await pglob('**/*.room.json', {cwd: path})) .map(async (roomUri) => { @@ -153,7 +153,7 @@ export default class Universe { async loadOrCreateEntity(user) { debugSilly('loadOrCreateEntity from user id %d', user.id); const playerPath = join(this.$$root, 'players', `${user.id}`); - const {Entity} = this.$$flecks.get('$avocado/resource.resources'); + const {Entity} = this.$$flecks.avocado.Resources; try { await stat(join(playerPath, 'index.entity.json')); const json = JSON.parse((await readFile(join(playerPath, 'index.entity.json'))).toString()); @@ -183,7 +183,7 @@ export default class Universe { debug("resource doesn't exist, creating..."); await writeFile(uri, '{}'); } - const {Universe} = this.$$flecks.get('$avocado/resource.resources'); + const {Universe} = this.$$flecks.avocado.Resources; const buffer = await readFile(uri); const json = JSON.parse(buffer.toString()); this.$$universe = await Universe.load(json);