object -> furniture

packages/backend/src/core/WorldRoomService.ts

@@ -159,7 +159,8 @@ export class WorldRoomService {
 	@bindThis
 	public collectReferencedDriveFileIds(roomState: MiWorldRoom['def']): Set<MiDriveFile['id']> {
 		const fileIds = new Set<MiDriveFile['id']>();
-		for (const o of roomState.installedFurnitures) {
+		const installedFurnitures = roomState.installedFurnitures ?? roomState.installedObjects; // 後方互換性のため
+		for (const o of installedFurnitures) {
 			const def = driveFileReferencingOptions[o.type];
 			if (def == null) continue;
 			for (const key of def) {

packages/frontend-misskey-world-engine/src/room/FurnitureContainer.ts

@@ -7,9 +7,9 @@ import * as BABYLON from '@babylonjs/core';
 import { camelToKebab, WORLD_SCALE } from 'misskey-world/src/utility.js';
 import { scaleMorph, Timer } from '../utility.js';
 import { convertRawOptions, type ConvertedOptions, type RawOptions } from '../mono.js';
-import { getFurnitureDef } from './object-defs.js';
+import { getFurnitureDef } from './furniture-defs.js';
 import { ModelManager, SYSTEM_MESH_NAMES } from './utility.js';
-import type { RoomFunitureInstance } from './object.js';
+import type { RoomFunitureInstance } from './furniture.js';
 import type { RoomAttachments } from 'misskey-world/src/room/type.js';
 
 function mergeMeshes(meshes: BABYLON.Mesh[], root: BABYLON.Mesh, hasTexture: boolean) {

packages/frontend-misskey-world-engine/src/room/engine.ts

@@ -24,11 +24,11 @@ import { EngineBase } from '../EngineBase.js';
 import { genId } from '../id.js';
 import { deepClone } from '../clone.js';
 import { PlayerContainer, type PlayerProfile, type PlayerState } from '../PlayerContainer.js';
-import { getFurnitureDef } from './object-defs.js';
+import { getFurnitureDef } from './furniture-defs.js';
 import { SYSTEM_HEYA_MESH_NAMES, SYSTEM_MESH_NAMES } from './utility.js';
 import { JapaneseEnvManager, MuseumEnvManager, SimpleEnvManager } from './env.js';
 import { FurnitureContainer } from './FurnitureContainer.js';
-import type { FurnitureDef, RawOptions } from './object.js';
+import type { FurnitureDef, RawOptions } from './furniture.js';
 import type { GridMaterial } from '@babylonjs/materials';
 import type { EnvManager } from './env.js';
 import type { RoomState_InstalledFurniture } from 'misskey-world/src/room/object.js';

packages/frontend-misskey-world-engine/src/room/furniture-defs.ts

@@ -0,0 +1,236 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { a4Case } from './furnitures/a4Case.js';
+import { aircon } from './furnitures/aircon.js';
+import { allInOnePc } from './furnitures/allInOnePc.js';
+import { aquarium } from './furnitures/aquarium.js';
+import { aromaReedDiffuser } from './furnitures/aromaReedDiffuser.js';
+import { banknote } from './furnitures/banknote.js';
+import { beamLamp } from './furnitures/beamLamp.js';
+import { bed } from './furnitures/bed.js';
+import { blind } from './furnitures/blind.js';
+import { book } from './furnitures/book.js';
+import { books } from './furnitures/books.js';
+import { boxWallShelf } from './furnitures/boxWallShelf.js';
+import { cactusS } from './furnitures/cactusS.js';
+import { cardboardBox } from './furnitures/cardboardBox.js';
+import { ceilingFanLight } from './furnitures/ceilingFanLight.js';
+import { chair } from './furnitures/chair.js';
+import { clippedPicture } from './furnitures/clippedPicture.js';
+import { coffeeCup } from './furnitures/coffeeCup.js';
+import { colorBox } from './furnitures/colorBox.js';
+import { cuboid } from './furnitures/cuboid.js';
+import { cupNoodle } from './furnitures/cupNoodle.js';
+import { curtain } from './furnitures/curtain.js';
+import { custardPudding } from './furnitures/custardPudding.js';
+import { debugHipoly } from './furnitures/debugHipoly.js';
+import { debugMetal } from './furnitures/debugMetal.js';
+import { descriptionPlate } from './furnitures/descriptionPlate.js';
+import { desk } from './furnitures/desk.js';
+import { desktopPc } from './furnitures/desktopPc.js';
+import { djMixer } from './furnitures/djMixer.js';
+import { djPlayer } from './furnitures/djPlayer.js';
+import { ductRailSpotLights } from './furnitures/ductRailSpotLights.js';
+import { ductTape } from './furnitures/ductTape.js';
+import { electronicDisplayBoard } from './furnitures/electronicDisplayBoard.js';
+import { emptyBento } from './furnitures/emptyBento.js';
+import { energyDrink } from './furnitures/energyDrink.js';
+import { envelope } from './furnitures/envelope.js';
+import { facialTissue } from './furnitures/facialTissue.js';
+import { glassCylinderPotPlant } from './furnitures/glassCylinderPotPlant.js';
+import { handheldGameConsole } from './furnitures/handheldGameConsole.js';
+import { hangingDuctRail } from './furnitures/hangingDuctRail.js';
+import { hangingTShirt } from './furnitures/hangingTShirt.js';
+import { icosahedron } from './furnitures/icosahedron.js';
+import { ironFrameShelf } from './furnitures/ironFrameShelf.js';
+import { ironFrameTable } from './furnitures/ironFrameTable.js';
+import { issyoubin } from './furnitures/issyoubin.js';
+import { keyboard } from './furnitures/keyboard.js';
+import { laptopPc } from './furnitures/laptopPc.js';
+import { largeMousepad } from './furnitures/largeMousepad.js';
+import { lavaLamp } from './furnitures/lavaLamp.js';
+import { letterCase } from './furnitures/letterCase.js';
+import { lowPartitionBar } from './furnitures/lowPartitionBar.js';
+import { miObjet } from './furnitures/miObjet.js';
+import { milk } from './furnitures/milk.js';
+import { miPlate } from './furnitures/miPlate.js';
+import { miPlateDisplayed } from './furnitures/miPlateDisplayed.js';
+import { mixer } from './furnitures/mixer.js';
+import { monitor } from './furnitures/monitor.js';
+import { monitorSpeaker } from './furnitures/monitorSpeaker.js';
+import { monstera } from './furnitures/monstera.js';
+import { mug } from './furnitures/mug.js';
+import { newtonsCradle } from './furnitures/newtonsCradle.js';
+import { openedCardboardBox } from './furnitures/openedCardboardBox.js';
+import { pachira } from './furnitures/pachira.js';
+import { petBottle } from './furnitures/petBottle.js';
+import { piano } from './furnitures/piano.js';
+import { pictureFrame } from './furnitures/pictureFrame.js';
+import { pizza } from './furnitures/pizza.js';
+import { plant } from './furnitures/plant.js';
+import { plant2 } from './furnitures/plant2.js';
+import { poster } from './furnitures/poster.js';
+import { powerStrip } from './furnitures/powerStrip.js';
+import { radiometer } from './furnitures/radiometer.js';
+import { randomBooks } from './furnitures/randomBooks.js';
+import { recordPlayer } from './furnitures/recordPlayer.js';
+import { rolledUpPoster } from './furnitures/rolledUpPoster.js';
+import { roundRug } from './furnitures/roundRug.js';
+import { router } from './furnitures/router.js';
+import { siphon } from './furnitures/siphon.js';
+import { snakeplant } from './furnitures/snakeplant.js';
+import { sofa } from './furnitures/sofa.js';
+import { speaker } from './furnitures/speaker.js';
+import { speakerStand } from './furnitures/speakerStand.js';
+import { spotLight } from './furnitures/spotLight.js';
+import { sprayer } from './furnitures/sprayer.js';
+import { stanchionPole } from './furnitures/stanchionPole.js';
+import { steelRack } from './furnitures/steelRack.js';
+import { stormGlass } from './furnitures/stormGlass.js';
+import { tableSalt } from './furnitures/tableSalt.js';
+import { tabletopCalendar } from './furnitures/tabletopCalendar.js';
+import { tabletopDigitalClock } from './furnitures/tabletopDigitalClock.js';
+import { tabletopFlag } from './furnitures/tabletopFlag.js';
+import { tabletopGlassPictureFrame } from './furnitures/tabletopGlassPictureFrame.js';
+import { tabletopIronFrameStand } from './furnitures/tabletopIronFrameStand.js';
+import { tabletopLcdButtonsController } from './furnitures/tabletopLcdButtonsController.js';
+import { tabletopPictureFrame } from './furnitures/tabletopPictureFrame.js';
+import { tapestry } from './furnitures/tapestry.js';
+import { tetrapod } from './furnitures/tetrapod.js';
+import { tv } from './furnitures/tv.js';
+import { twistedCubeObjet } from './furnitures/twistedCubeObjet.js';
+import { usedTissue } from './furnitures/usedTissue.js';
+import { wallCanvas } from './furnitures/wallCanvas.js';
+import { wallClock } from './furnitures/wallClock.js';
+import { wallGlassPictureFrame } from './furnitures/wallGlassPictureFrame.js';
+import { wallMirror } from './furnitures/wallMirror.js';
+import { wallMountSpotLight } from './furnitures/wallMountSpotLight.js';
+import { wallShelf } from './furnitures/wallShelf.js';
+import { wireBasket } from './furnitures/wireBasket.js';
+import { wireNet } from './furnitures/wireNet.js';
+import { woodRingFloorLamp } from './furnitures/woodRingFloorLamp.js';
+import { woodRingsPendantLight } from './furnitures/woodRingsPendantLight.js';
+import { woodSoundAbsorbingPanel } from './furnitures/woodSoundAbsorbingPanel.js';
+
+export const FUNITURE_DEFS = [
+	a4Case,
+	aircon,
+	allInOnePc,
+	aquarium,
+	aromaReedDiffuser,
+	banknote,
+	beamLamp,
+	bed,
+	blind,
+	books,
+	boxWallShelf,
+	cactusS,
+	cardboardBox,
+	ceilingFanLight,
+	chair,
+	coffeeCup,
+	colorBox,
+	cuboid,
+	cupNoodle,
+	custardPudding,
+	desk,
+	desktopPc,
+	djMixer,
+	djPlayer,
+	ductRailSpotLights,
+	ductTape,
+	electronicDisplayBoard,
+	emptyBento,
+	energyDrink,
+	envelope,
+	facialTissue,
+	glassCylinderPotPlant,
+	hangingTShirt,
+	icosahedron,
+	ironFrameShelf,
+	ironFrameTable,
+	issyoubin,
+	keyboard,
+	laptopPc,
+	largeMousepad,
+	lavaLamp,
+	letterCase,
+	miObjet,
+	milk,
+	miPlate,
+	miPlateDisplayed,
+	mixer,
+	monitor,
+	monitorSpeaker,
+	monstera,
+	mug,
+	newtonsCradle,
+	openedCardboardBox,
+	pachira,
+	petBottle,
+	piano,
+	pictureFrame,
+	pizza,
+	plant,
+	plant2,
+	poster,
+	powerStrip,
+	radiometer,
+	randomBooks,
+	recordPlayer,
+	rolledUpPoster,
+	roundRug,
+	router,
+	siphon,
+	snakeplant,
+	sofa,
+	speaker,
+	speakerStand,
+	sprayer,
+	steelRack,
+	stormGlass,
+	tableSalt,
+	tabletopCalendar,
+	tabletopDigitalClock,
+	tabletopFlag,
+	tabletopGlassPictureFrame,
+	tabletopIronFrameStand,
+	tabletopPictureFrame,
+	tabletopLcdButtonsController,
+	tapestry,
+	tetrapod,
+	tv,
+	twistedCubeObjet,
+	usedTissue,
+	wallCanvas,
+	wallClock,
+	wallGlassPictureFrame,
+	wallMirror,
+	wallMountSpotLight,
+	wallShelf,
+	woodRingFloorLamp,
+	woodRingsPendantLight,
+	woodSoundAbsorbingPanel,
+	hangingDuctRail,
+	spotLight,
+	lowPartitionBar,
+	descriptionPlate,
+	stanchionPole,
+	handheldGameConsole,
+	debugMetal,
+	curtain,
+	wireNet,
+	clippedPicture,
+	wireBasket,
+] as FurnitureDef[];
+
+export function getFurnitureDef(type: string): FurnitureDef {
+	const def = FUNITURE_DEFS.find(x => x.id === type) as FurnitureDef | undefined;
+	if (def == null) {
+		throw new Error(`Unrecognized funiture type: ${type}`);
+	}
+	return def;
+}

packages/frontend-misskey-world-engine/src/room/furnitures/a4Case.ts

@@ -4,8 +4,8 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { defineFuniture } from '../object.js';
-import { a4Case_schema } from 'misskey-world/src/room/objects/a4Case.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { a4Case_schema } from 'misskey-world/src/room/furnitures/a4Case.schema.js';
 
 export const a4Case = defineFuniture(a4Case_schema, {
 	createInstance: ({ options, model }) => {

packages/frontend-misskey-world-engine/src/room/furnitures/aircon.ts

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { defineFuniture } from '../object.js';
-import { aircon_schema } from 'misskey-world/src/room/objects/aircon.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { aircon_schema } from 'misskey-world/src/room/furnitures/aircon.schema.js';
 
 export const aircon = defineFuniture(aircon_schema, {
 	createInstance: () => {

packages/frontend-misskey-world-engine/src/room/furnitures/allInOnePc.ts

@@ -5,8 +5,8 @@
 
 import * as BABYLON from '@babylonjs/core';
 import { cm, WORLD_SCALE } from 'misskey-world/src/utility.js';
-import { allInOnePc_schema } from 'misskey-world/src/room/objects/allInOnePc.schema.js';
-import { createTextureManager, defineFuniture } from '../object.js';
+import { allInOnePc_schema } from 'misskey-world/src/room/furnitures/allInOnePc.schema.js';
+import { createTextureManager, defineFuniture } from '../furniture.js';
 import { getLightRangeFactorByGraphicsQuality } from '../utility.js';
 
 export const allInOnePc = defineFuniture(allInOnePc_schema, {

packages/frontend-misskey-world-engine/src/room/furnitures/aquarium.ts

@@ -4,9 +4,9 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { defineFuniture } from '../object.js';
+import { defineFuniture } from '../furniture.js';
 import { cm } from 'misskey-world/src/utility.js';
-import { aquarium_schema } from 'misskey-world/src/room/objects/aquarium.schema.js';
+import { aquarium_schema } from 'misskey-world/src/room/furnitures/aquarium.schema.js';
 
 export const aquarium = defineFuniture(aquarium_schema, {
 	createInstance: ({ scene, root }) => {

packages/frontend-misskey-world-engine/src/room/furnitures/aromaReedDiffuser.ts

@@ -4,8 +4,8 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { aromaReedDiffuser_schema } from 'misskey-world/src/room/objects/aromaReedDiffuser.schema.js';
-import { defineFuniture } from '../object.js';
+import { aromaReedDiffuser_schema } from 'misskey-world/src/room/furnitures/aromaReedDiffuser.schema.js';
+import { defineFuniture } from '../furniture.js';
 
 export const aromaReedDiffuser = defineFuniture(aromaReedDiffuser_schema, {
 	createInstance: ({ options, model }) => {

packages/frontend-misskey-world-engine/src/room/furnitures/banknote.ts

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { defineFuniture } from '../object.js';
-import { banknote_schema } from 'misskey-world/src/room/objects/banknote.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { banknote_schema } from 'misskey-world/src/room/furnitures/banknote.schema.js';
 
 export const banknote = defineFuniture(banknote_schema, {
 	createInstance: () => {

packages/frontend-misskey-world-engine/src/room/furnitures/beamLamp.ts

@@ -4,10 +4,10 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { defineFuniture } from '../object.js';
+import { defineFuniture } from '../furniture.js';
 import { cm, WORLD_SCALE } from 'misskey-world/src/utility.js';
 import { getLightRangeFactorByGraphicsQuality } from '../utility.js';
-import { beamLamp_schema } from 'misskey-world/src/room/objects/beamLamp.schema.js';
+import { beamLamp_schema } from 'misskey-world/src/room/furnitures/beamLamp.schema.js';
 
 export const beamLamp = defineFuniture(beamLamp_schema, {
 	createInstance: ({ lc, root, scene, graphicsQuality }) => {

packages/frontend-misskey-world-engine/src/room/furnitures/bed.ts

@@ -4,8 +4,8 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { defineFuniture } from '../object.js';
-import { bed_schema } from 'misskey-world/src/room/objects/bed.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { bed_schema } from 'misskey-world/src/room/furnitures/bed.schema.js';
 
 export const bed = defineFuniture(bed_schema, {
 	createInstance: ({ options, model }) => {

packages/frontend-misskey-world-engine/src/room/furnitures/blind.ts

@@ -4,10 +4,10 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { defineFuniture } from '../object.js';
+import { defineFuniture } from '../furniture.js';
 import { cm, remap } from 'misskey-world/src/utility.js';
 import { createOverridedStates } from '../utility.js';
-import { blind_schema } from 'misskey-world/src/room/objects/blind.schema.js';
+import { blind_schema } from 'misskey-world/src/room/furnitures/blind.schema.js';
 
 export const blind = defineFuniture(blind_schema, {
 	createInstance: ({ options, model }) => {

packages/frontend-misskey-world-engine/src/room/furnitures/book.ts

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 import * as BABYLON from '@babylonjs/core';
-import { defineFuniture } from '../object.js';
-import { book_schema } from 'misskey-world/src/room/objects/book.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { book_schema } from 'misskey-world/src/room/furnitures/book.schema.js';
 
 export const book = defineFuniture(book_schema, {
 	createInstance: ({ options, model }) => {

packages/frontend-misskey-world-engine/src/room/furnitures/books.ts

@@ -4,9 +4,9 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { defineFuniture } from '../object.js';
+import { defineFuniture } from '../furniture.js';
 import { cm } from 'misskey-world/src/utility.js';
-import { books_schema } from 'misskey-world/src/room/objects/books.schema.js';
+import { books_schema } from 'misskey-world/src/room/furnitures/books.schema.js';
 
 export const books = defineFuniture(books_schema, {
 	createInstance: ({ scene, options, model }) => {

packages/frontend-misskey-world-engine/src/room/furnitures/boxWallShelf.ts

@@ -4,8 +4,8 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { defineFuniture } from '../object.js';
-import { boxWallShelf_schema } from 'misskey-world/src/room/objects/boxWallShelf.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { boxWallShelf_schema } from 'misskey-world/src/room/furnitures/boxWallShelf.schema.js';
 
 export const boxWallShelf = defineFuniture(boxWallShelf_schema, {
 	createInstance: async ({ scene, options, model }) => {

packages/frontend-misskey-world-engine/src/room/furnitures/cactusS.ts

@@ -4,8 +4,8 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { defineFuniture } from '../object.js';
-import { cactusS_schema } from 'misskey-world/src/room/objects/cactusS.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { cactusS_schema } from 'misskey-world/src/room/furnitures/cactusS.schema.js';
 
 export const cactusS = defineFuniture(cactusS_schema, {
 	createInstance: ({ options, model }) => {

packages/frontend-misskey-world-engine/src/room/furnitures/cardboardBox.ts

@@ -4,8 +4,8 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { defineFuniture } from '../object.js';
-import { cardboardBox_schema } from 'misskey-world/src/room/objects/cardboardBox.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { cardboardBox_schema } from 'misskey-world/src/room/furnitures/cardboardBox.schema.js';
 
 export const cardboardBox = defineFuniture(cardboardBox_schema, {
 	createInstance: ({ scene, options, model }) => {

packages/frontend-misskey-world-engine/src/room/furnitures/ceilingFanLight.ts

@@ -4,8 +4,8 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { defineFuniture } from '../object.js';
-import { ceilingFanLight_schema } from 'misskey-world/src/room/objects/ceilingFanLight.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { ceilingFanLight_schema } from 'misskey-world/src/room/furnitures/ceilingFanLight.schema.js';
 
 export const ceilingFanLight = defineFuniture(ceilingFanLight_schema, {
 	createInstance: ({ options, sr, scene, model }) => {

packages/frontend-misskey-world-engine/src/room/furnitures/chair.ts

@@ -4,8 +4,8 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { defineFuniture } from '../object.js';
-import { chair_schema } from 'misskey-world/src/room/objects/chair.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { chair_schema } from 'misskey-world/src/room/furnitures/chair.schema.js';
 
 export const chair = defineFuniture(chair_schema, {
 	createInstance: ({ model, options, sitChair }) => {

packages/frontend-misskey-world-engine/src/room/furnitures/clippedPicture.ts

@@ -4,9 +4,9 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { createTextureManager, defineFuniture } from '../object.js';
+import { createTextureManager, defineFuniture } from '../furniture.js';
 import { remap } from 'misskey-world/src/utility.js';
-import { clippedPicture_schema } from 'misskey-world/src/room/objects/clippedPicture.schema.js';
+import { clippedPicture_schema } from 'misskey-world/src/room/furnitures/clippedPicture.schema.js';
 
 export const clippedPicture = defineFuniture(clippedPicture_schema, {
 	createInstance: async ({ scene, options, model }) => {

packages/frontend-misskey-world-engine/src/room/furnitures/coffeeCup.ts

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { defineFuniture } from '../object.js';
-import { coffeeCup_schema } from 'misskey-world/src/room/objects/coffeeCup.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { coffeeCup_schema } from 'misskey-world/src/room/furnitures/coffeeCup.schema.js';
 
 export const coffeeCup = defineFuniture(coffeeCup_schema, {
 	createInstance: () => {

packages/frontend-misskey-world-engine/src/room/furnitures/colorBox.ts

@@ -4,8 +4,8 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { defineFuniture } from '../object.js';
-import { colorBox_schema } from 'misskey-world/src/room/objects/colorBox.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { colorBox_schema } from 'misskey-world/src/room/furnitures/colorBox.schema.js';
 
 export const colorBox = defineFuniture(colorBox_schema, {
 	createInstance: ({ options, model }) => {

packages/frontend-misskey-world-engine/src/room/furnitures/cuboid.ts

@@ -4,8 +4,8 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { defineFuniture } from '../object.js';
-import { cuboid_schema } from 'misskey-world/src/room/objects/cuboid.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { cuboid_schema } from 'misskey-world/src/room/furnitures/cuboid.schema.js';
 
 export const cuboid = defineFuniture(cuboid_schema, {
 	createInstance: async ({ scene, options, model }) => {

packages/frontend-misskey-world-engine/src/room/furnitures/cupNoodle.ts

@@ -4,10 +4,10 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { defineFuniture } from '../object.js';
+import { defineFuniture } from '../furniture.js';
 import { cm } from 'misskey-world/src/utility.js';
 import { yuge } from '../utility.js';
-import { cupNoodle_schema } from 'misskey-world/src/room/objects/cupNoodle.schema.js';
+import { cupNoodle_schema } from 'misskey-world/src/room/furnitures/cupNoodle.schema.js';
 
 export const cupNoodle = defineFuniture(cupNoodle_schema, {
 	createInstance: ({ scene, root, sr }) => {

packages/frontend-misskey-world-engine/src/room/furnitures/curtain.ts

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { defineFuniture } from '../object.js';
-import { curtain_schema } from 'misskey-world/src/room/objects/curtain.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { curtain_schema } from 'misskey-world/src/room/furnitures/curtain.schema.js';
 
 export const curtain = defineFuniture(curtain_schema, {
 	createInstance: () => {

packages/frontend-misskey-world-engine/src/room/furnitures/custardPudding.ts

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { defineFuniture } from '../object.js';
-import { custardPudding_schema } from 'misskey-world/src/room/objects/custardPudding.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { custardPudding_schema } from 'misskey-world/src/room/furnitures/custardPudding.schema.js';
 
 export const custardPudding = defineFuniture(custardPudding_schema, {
 	createInstance: () => {

packages/frontend-misskey-world-engine/src/room/furnitures/debugHipoly.ts

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { defineFuniture } from '../object.js';
-import { debugHipoly_schema } from 'misskey-world/src/room/objects/debugHipoly.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { debugHipoly_schema } from 'misskey-world/src/room/furnitures/debugHipoly.schema.js';
 
 export const debugHipoly = defineFuniture(debugHipoly_schema, {
 	createInstance: () => {

packages/frontend-misskey-world-engine/src/room/furnitures/debugMetal.ts

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { defineFuniture } from '../object.js';
-import { debugMetal_schema } from 'misskey-world/src/room/objects/debugMetal.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { debugMetal_schema } from 'misskey-world/src/room/furnitures/debugMetal.schema.js';
 
 export const debugMetal = defineFuniture(debugMetal_schema, {
 	createInstance: () => {

packages/frontend-misskey-world-engine/src/room/furnitures/descriptionPlate.ts

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { defineFuniture } from '../object.js';
-import { descriptionPlate_schema } from 'misskey-world/src/room/objects/descriptionPlate.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { descriptionPlate_schema } from 'misskey-world/src/room/furnitures/descriptionPlate.schema.js';
 
 export const descriptionPlate = defineFuniture(descriptionPlate_schema, {
 	createInstance: () => {

packages/frontend-misskey-world-engine/src/room/furnitures/desk.ts

@@ -4,8 +4,8 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { defineFuniture } from '../object.js';
-import { desk_schema } from 'misskey-world/src/room/objects/desk.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { desk_schema } from 'misskey-world/src/room/furnitures/desk.schema.js';
 
 export const desk = defineFuniture(desk_schema, {
 	createInstance: ({ options, model }) => {

packages/frontend-misskey-world-engine/src/room/furnitures/desktopPc.ts

@@ -4,10 +4,10 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { defineFuniture } from '../object.js';
+import { defineFuniture } from '../furniture.js';
 import { cm, WORLD_SCALE } from 'misskey-world/src/utility.js';
 import { getLightRangeFactorByGraphicsQuality } from '../utility.js';
-import { desktopPc_schema } from 'misskey-world/src/room/objects/desktopPc.schema.js';
+import { desktopPc_schema } from 'misskey-world/src/room/furnitures/desktopPc.schema.js';
 
 export const desktopPc = defineFuniture(desktopPc_schema, {
 	createInstance: ({ options, model, root, scene, lc, graphicsQuality }) => {

packages/frontend-misskey-world-engine/src/room/furnitures/djMixer.ts

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { defineFuniture } from '../object.js';
-import { djMixer_schema } from 'misskey-world/src/room/objects/djMixer.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { djMixer_schema } from 'misskey-world/src/room/furnitures/djMixer.schema.js';
 
 export const djMixer = defineFuniture(djMixer_schema, {
 	createInstance: () => {

packages/frontend-misskey-world-engine/src/room/furnitures/djPlayer.ts

@@ -4,8 +4,8 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { djPlayer_schema } from 'misskey-world/src/room/objects/djPlayer.schema.js';
-import { createTextureManager, defineFuniture } from '../object.js';
+import { djPlayer_schema } from 'misskey-world/src/room/furnitures/djPlayer.schema.js';
+import { createTextureManager, defineFuniture } from '../furniture.js';
 import { normalizeUvToSquare } from '../../utility.js';
 
 export const djPlayer = defineFuniture(djPlayer_schema, {

packages/frontend-misskey-world-engine/src/room/furnitures/ductRailSpotLights.ts

@@ -4,10 +4,10 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { defineFuniture } from '../object.js';
+import { defineFuniture } from '../furniture.js';
 import { getLightRangeFactorByGraphicsQuality } from '../utility.js';
 import { cm, remap, WORLD_SCALE } from 'misskey-world/src/utility.js';
-import { ductRailSpotLights_schema } from 'misskey-world/src/room/objects/ductRailSpotLights.schema.js';
+import { ductRailSpotLights_schema } from 'misskey-world/src/room/furnitures/ductRailSpotLights.schema.js';
 
 export const ductRailSpotLights = defineFuniture(ductRailSpotLights_schema, {
 	createInstance: ({ lc, scene, options, model, graphicsQuality }) => {

packages/frontend-misskey-world-engine/src/room/furnitures/ductTape.ts

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { defineFuniture } from '../object.js';
-import { ductTape_schema } from 'misskey-world/src/room/objects/ductTape.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { ductTape_schema } from 'misskey-world/src/room/furnitures/ductTape.schema.js';
 
 export const ductTape = defineFuniture(ductTape_schema, {
 	createInstance: () => {

packages/frontend-misskey-world-engine/src/room/furnitures/electronicDisplayBoard.ts

@@ -4,8 +4,8 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { electronicDisplayBoard_schema } from 'misskey-world/src/room/objects/electronicDisplayBoard.schema.js';
-import { defineFuniture } from '../object.js';
+import { electronicDisplayBoard_schema } from 'misskey-world/src/room/furnitures/electronicDisplayBoard.schema.js';
+import { defineFuniture } from '../furniture.js';
 import { RecyvlingTextGrid } from '../../utility.js';
 
 export const electronicDisplayBoard = defineFuniture(electronicDisplayBoard_schema, {

packages/frontend-misskey-world-engine/src/room/furnitures/emptyBento.ts

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { defineFuniture } from '../object.js';
-import { emptyBento_schema } from 'misskey-world/src/room/objects/emptyBento.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { emptyBento_schema } from 'misskey-world/src/room/furnitures/emptyBento.schema.js';
 
 export const emptyBento = defineFuniture(emptyBento_schema, {
 	createInstance: () => {

packages/frontend-misskey-world-engine/src/room/furnitures/energyDrink.ts

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { defineFuniture } from '../object.js';
-import { energyDrink_schema } from 'misskey-world/src/room/objects/energyDrink.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { energyDrink_schema } from 'misskey-world/src/room/furnitures/energyDrink.schema.js';
 
 export const energyDrink = defineFuniture(energyDrink_schema, {
 	createInstance: () => {

packages/frontend-misskey-world-engine/src/room/furnitures/envelope.ts

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { defineFuniture } from '../object.js';
-import { envelope_schema } from 'misskey-world/src/room/objects/envelope.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { envelope_schema } from 'misskey-world/src/room/furnitures/envelope.schema.js';
 
 export const envelope = defineFuniture(envelope_schema, {
 	createInstance: () => {

packages/frontend-misskey-world-engine/src/room/furnitures/facialTissue.ts

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { defineFuniture } from '../object.js';
-import { facialTissue_schema } from 'misskey-world/src/room/objects/facialTissue.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { facialTissue_schema } from 'misskey-world/src/room/furnitures/facialTissue.schema.js';
 
 export const facialTissue = defineFuniture(facialTissue_schema, {
 	createInstance: () => {

packages/frontend-misskey-world-engine/src/room/furnitures/glassCylinderPotPlant.ts

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { defineFuniture } from '../object.js';
-import { glassCylinderPotPlant_schema } from 'misskey-world/src/room/objects/glassCylinderPotPlant.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { glassCylinderPotPlant_schema } from 'misskey-world/src/room/furnitures/glassCylinderPotPlant.schema.js';
 
 export const glassCylinderPotPlant = defineFuniture(glassCylinderPotPlant_schema, {
 	createInstance: () => {

packages/frontend-misskey-world-engine/src/room/furnitures/handheldGameConsole.ts

@@ -4,8 +4,8 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { handheldGameConsole_schema } from 'misskey-world/src/room/objects/handheldGameConsole.schema.js';
-import { createTextureManager, defineFuniture } from '../object.js';
+import { handheldGameConsole_schema } from 'misskey-world/src/room/furnitures/handheldGameConsole.schema.js';
+import { createTextureManager, defineFuniture } from '../furniture.js';
 
 export const handheldGameConsole = defineFuniture(handheldGameConsole_schema, {
 	createInstance: async ({ scene, options, model }) => {

packages/frontend-misskey-world-engine/src/room/furnitures/hangingDuctRail.ts

@@ -4,8 +4,8 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { defineFuniture } from '../object.js';
-import { hangingDuctRail_schema } from 'misskey-world/src/room/objects/hangingDuctRail.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { hangingDuctRail_schema } from 'misskey-world/src/room/furnitures/hangingDuctRail.schema.js';
 
 export const hangingDuctRail = defineFuniture(hangingDuctRail_schema, {
 	createInstance: async ({ options, model }) => {

packages/frontend-misskey-world-engine/src/room/furnitures/hangingTShirt.ts

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { defineFuniture } from '../object.js';
-import { hangingTShirt_schema } from 'misskey-world/src/room/objects/hangingTShirt.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { hangingTShirt_schema } from 'misskey-world/src/room/furnitures/hangingTShirt.schema.js';
 
 export const hangingTShirt = defineFuniture(hangingTShirt_schema, {
 	createInstance: () => {

packages/frontend-misskey-world-engine/src/room/furnitures/icosahedron.ts

@@ -4,8 +4,8 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { defineFuniture } from '../object.js';
-import { icosahedron_schema } from 'misskey-world/src/room/objects/icosahedron.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { icosahedron_schema } from 'misskey-world/src/room/furnitures/icosahedron.schema.js';
 
 export const icosahedron = defineFuniture(icosahedron_schema, {
 	createInstance: ({ options, model }) => {

packages/frontend-misskey-world-engine/src/room/furnitures/ironFrameShelf.ts

@@ -4,8 +4,8 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { defineFuniture } from '../object.js';
-import { ironFrameShelf_schema } from 'misskey-world/src/room/objects/ironFrameShelf.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { ironFrameShelf_schema } from 'misskey-world/src/room/furnitures/ironFrameShelf.schema.js';
 
 export const ironFrameShelf = defineFuniture(ironFrameShelf_schema, {
 	path: (options) => {

packages/frontend-misskey-world-engine/src/room/furnitures/ironFrameTable.ts

@@ -4,8 +4,8 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { defineFuniture } from '../object.js';
-import { ironFrameTable_schema } from 'misskey-world/src/room/objects/ironFrameTable.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { ironFrameTable_schema } from 'misskey-world/src/room/furnitures/ironFrameTable.schema.js';
 
 export const ironFrameTable = defineFuniture(ironFrameTable_schema, {
 	createInstance: ({ options, model, stickyMarkerMeshUpdated }) => {

packages/frontend-misskey-world-engine/src/room/furnitures/issyoubin.ts

@@ -4,8 +4,8 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { defineFuniture } from '../object.js';
-import { issyoubin_schema } from 'misskey-world/src/room/objects/issyoubin.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { issyoubin_schema } from 'misskey-world/src/room/furnitures/issyoubin.schema.js';
 
 export const issyoubin = defineFuniture(issyoubin_schema, {
 	createInstance: ({ model, options, scene }) => {

packages/frontend-misskey-world-engine/src/room/furnitures/keyboard.ts

@@ -4,8 +4,8 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { defineFuniture } from '../object.js';
-import { keyboard_schema } from 'misskey-world/src/room/objects/keyboard.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { keyboard_schema } from 'misskey-world/src/room/furnitures/keyboard.schema.js';
 
 export const keyboard = defineFuniture(keyboard_schema, {
 	createInstance: ({ options, model }) => {

packages/frontend-misskey-world-engine/src/room/furnitures/laptopPc.ts

@@ -5,8 +5,8 @@
 
 import * as BABYLON from '@babylonjs/core';
 import { cm, WORLD_SCALE } from 'misskey-world/src/utility.js';
-import { laptopPc_schema } from 'misskey-world/src/room/objects/laptopPc.schema.js';
-import { createTextureManager, defineFuniture } from '../object.js';
+import { laptopPc_schema } from 'misskey-world/src/room/furnitures/laptopPc.schema.js';
+import { createTextureManager, defineFuniture } from '../furniture.js';
 import { getLightRangeFactorByGraphicsQuality } from '../utility.js';
 
 export const laptopPc = defineFuniture(laptopPc_schema, {

packages/frontend-misskey-world-engine/src/room/furnitures/largeMousepad.ts

@@ -4,8 +4,8 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { createTextureManager, defineFuniture } from '../object.js';
-import { largeMousepad_schema } from 'misskey-world/src/room/objects/largeMousepad.schema.js';
+import { createTextureManager, defineFuniture } from '../furniture.js';
+import { largeMousepad_schema } from 'misskey-world/src/room/furnitures/largeMousepad.schema.js';
 
 export const largeMousepad = defineFuniture(largeMousepad_schema, {
 	createInstance: async ({ scene, options, model }) => {

packages/frontend-misskey-world-engine/src/room/furnitures/lavaLamp.ts

@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 import * as BABYLON from '@babylonjs/core';
-import { lavaLamp_schema } from 'misskey-world/src/room/objects/lavaLamp.schema.js';
+import { lavaLamp_schema } from 'misskey-world/src/room/furnitures/lavaLamp.schema.js';
 import { cm, WORLD_SCALE } from 'misskey-world/src/utility.js';
-import { defineFuniture } from '../object.js';
+import { defineFuniture } from '../furniture.js';
 import { getLightRangeFactorByGraphicsQuality } from '../utility.js';
 
 export const lavaLamp = defineFuniture(lavaLamp_schema, {

packages/frontend-misskey-world-engine/src/room/furnitures/letterCase.ts

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { defineFuniture } from '../object.js';
-import { letterCase_schema } from 'misskey-world/src/room/objects/letterCase.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { letterCase_schema } from 'misskey-world/src/room/furnitures/letterCase.schema.js';
 
 export const letterCase = defineFuniture(letterCase_schema, {
 	createInstance: () => {

packages/frontend-misskey-world-engine/src/room/furnitures/lowPartitionBar.ts

@@ -4,8 +4,8 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { defineFuniture } from '../object.js';
-import { lowPartitionBar_schema } from 'misskey-world/src/room/objects/lowPartitionBar.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { lowPartitionBar_schema } from 'misskey-world/src/room/furnitures/lowPartitionBar.schema.js';
 
 export const lowPartitionBar = defineFuniture(lowPartitionBar_schema, {
 	createInstance: ({ options, model }) => {

packages/frontend-misskey-world-engine/src/room/furnitures/miObjet.ts

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { defineFuniture } from '../object.js';
-import { miObjet_schema } from 'misskey-world/src/room/objects/miObjet.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { miObjet_schema } from 'misskey-world/src/room/furnitures/miObjet.schema.js';
 
 export const miObjet = defineFuniture(miObjet_schema, {
 	createInstance: () => {

packages/frontend-misskey-world-engine/src/room/furnitures/miPlate.ts

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { defineFuniture } from '../object.js';
-import { miPlate_schema } from 'misskey-world/src/room/objects/miPlate.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { miPlate_schema } from 'misskey-world/src/room/furnitures/miPlate.schema.js';
 
 export const miPlate = defineFuniture(miPlate_schema, {
 	createInstance: () => {

packages/frontend-misskey-world-engine/src/room/furnitures/miPlateDisplayed.ts

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { defineFuniture } from '../object.js';
-import { miPlateDisplayed_schema } from 'misskey-world/src/room/objects/miPlateDisplayed.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { miPlateDisplayed_schema } from 'misskey-world/src/room/furnitures/miPlateDisplayed.schema.js';
 
 export const miPlateDisplayed = defineFuniture(miPlateDisplayed_schema, {
 	createInstance: () => {

packages/frontend-misskey-world-engine/src/room/furnitures/milk.ts

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { defineFuniture } from '../object.js';
-import { milk_schema } from 'misskey-world/src/room/objects/milk.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { milk_schema } from 'misskey-world/src/room/furnitures/milk.schema.js';
 
 export const milk = defineFuniture(milk_schema, {
 	createInstance: () => {

packages/frontend-misskey-world-engine/src/room/furnitures/mixer.ts

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { defineFuniture } from '../object.js';
-import { mixer_schema } from 'misskey-world/src/room/objects/mixer.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { mixer_schema } from 'misskey-world/src/room/furnitures/mixer.schema.js';
 
 export const mixer = defineFuniture(mixer_schema, {
 	createInstance: () => {

packages/frontend-misskey-world-engine/src/room/furnitures/monitor.ts

@@ -5,8 +5,8 @@
 
 import * as BABYLON from '@babylonjs/core';
 import { cm, WORLD_SCALE } from 'misskey-world/src/utility.js';
-import { monitor_schema } from 'misskey-world/src/room/objects/monitor.schema.js';
-import { createTextureManager, defineFuniture } from '../object.js';
+import { monitor_schema } from 'misskey-world/src/room/furnitures/monitor.schema.js';
+import { createTextureManager, defineFuniture } from '../furniture.js';
 import { getLightRangeFactorByGraphicsQuality } from '../utility.js';
 import { normalizeUvToSquare } from '../../utility.js';
 

packages/frontend-misskey-world-engine/src/room/furnitures/monitorSpeaker.ts

@@ -4,8 +4,8 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { defineFuniture } from '../object.js';
-import { monitorSpeaker_schema } from 'misskey-world/src/room/objects/monitorSpeaker.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { monitorSpeaker_schema } from 'misskey-world/src/room/furnitures/monitorSpeaker.schema.js';
 
 export const monitorSpeaker = defineFuniture(monitorSpeaker_schema, {
 	createInstance: ({ options, model }) => {

packages/frontend-misskey-world-engine/src/room/furnitures/monstera.ts

@@ -4,8 +4,8 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { defineFuniture } from '../object.js';
-import { monstera_schema } from 'misskey-world/src/room/objects/monstera.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { monstera_schema } from 'misskey-world/src/room/furnitures/monstera.schema.js';
 
 export const monstera = defineFuniture(monstera_schema, {
 	createInstance: ({ options, model }) => {

packages/frontend-misskey-world-engine/src/room/furnitures/mug.ts

@@ -5,8 +5,8 @@
 
 import * as BABYLON from '@babylonjs/core';
 import { cm } from 'misskey-world/src/utility.js';
-import { mug_schema } from 'misskey-world/src/room/objects/mug.schema.js';
-import { defineFuniture } from '../object.js';
+import { mug_schema } from 'misskey-world/src/room/furnitures/mug.schema.js';
+import { defineFuniture } from '../furniture.js';
 import { yuge } from '../utility.js';
 
 export const mug = defineFuniture(mug_schema, {

packages/frontend-misskey-world-engine/src/room/furnitures/newtonsCradle.ts

@@ -4,8 +4,8 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { defineFuniture } from '../object.js';
-import { newtonsCradle_schema } from 'misskey-world/src/room/objects/newtonsCradle.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { newtonsCradle_schema } from 'misskey-world/src/room/furnitures/newtonsCradle.schema.js';
 
 export const newtonsCradle = defineFuniture(newtonsCradle_schema, {
 	createInstance: ({ options, model }) => {

packages/frontend-misskey-world-engine/src/room/furnitures/openedCardboardBox.ts

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { defineFuniture } from '../object.js';
-import { openedCardboardBox_schema } from 'misskey-world/src/room/objects/openedCardboardBox.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { openedCardboardBox_schema } from 'misskey-world/src/room/furnitures/openedCardboardBox.schema.js';
 
 export const openedCardboardBox = defineFuniture(openedCardboardBox_schema, {
 	createInstance: () => {

packages/frontend-misskey-world-engine/src/room/furnitures/pachira.ts

@@ -4,8 +4,8 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { defineFuniture } from '../object.js';
-import { pachira_schema } from 'misskey-world/src/room/objects/pachira.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { pachira_schema } from 'misskey-world/src/room/furnitures/pachira.schema.js';
 
 export const pachira = defineFuniture(pachira_schema, {
 	createInstance: ({ options, model }) => {

packages/frontend-misskey-world-engine/src/room/furnitures/petBottle.ts

@@ -4,8 +4,8 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { defineFuniture } from '../object.js';
-import { petBottle_schema } from 'misskey-world/src/room/objects/petBottle.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { petBottle_schema } from 'misskey-world/src/room/furnitures/petBottle.schema.js';
 
 export const petBottle = defineFuniture(petBottle_schema, {
 	createInstance: ({ model, options, scene }) => {

packages/frontend-misskey-world-engine/src/room/furnitures/piano.ts

@@ -4,8 +4,8 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { defineFuniture } from '../object.js';
-import { piano_schema } from 'misskey-world/src/room/objects/piano.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { piano_schema } from 'misskey-world/src/room/furnitures/piano.schema.js';
 
 export const piano = defineFuniture(piano_schema, {
 	createInstance: ({ options, model }) => {

packages/frontend-misskey-world-engine/src/room/furnitures/pictureFrame.ts

@@ -4,8 +4,8 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { createTextureManager, defineFuniture } from '../object.js';
-import { pictureFrame_schema } from 'misskey-world/src/room/objects/pictureFrame.schema.js';
+import { createTextureManager, defineFuniture } from '../furniture.js';
+import { pictureFrame_schema } from 'misskey-world/src/room/furnitures/pictureFrame.schema.js';
 
 // NOTE: シェイプキーのnormalのエクスポートは無効にしないとmatを大きくしたときに面のレンダリングがグリッチする
 

packages/frontend-misskey-world-engine/src/room/furnitures/pizza.ts

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { defineFuniture } from '../object.js';
-import { pizza_schema } from 'misskey-world/src/room/objects/pizza.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { pizza_schema } from 'misskey-world/src/room/furnitures/pizza.schema.js';
 
 export const pizza = defineFuniture(pizza_schema, {
 	createInstance: () => {

packages/frontend-misskey-world-engine/src/room/furnitures/plant.ts

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { defineFuniture } from '../object.js';
-import { plant_schema } from 'misskey-world/src/room/objects/plant.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { plant_schema } from 'misskey-world/src/room/furnitures/plant.schema.js';
 
 export const plant = defineFuniture(plant_schema, {
 	createInstance: () => {

packages/frontend-misskey-world-engine/src/room/furnitures/plant2.ts

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { defineFuniture } from '../object.js';
-import { plant2_schema } from 'misskey-world/src/room/objects/plant2.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { plant2_schema } from 'misskey-world/src/room/furnitures/plant2.schema.js';
 
 export const plant2 = defineFuniture(plant2_schema, {
 	createInstance: () => {

packages/frontend-misskey-world-engine/src/room/furnitures/poster.ts

@@ -4,9 +4,9 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { createTextureManager, defineFuniture } from '../object.js';
+import { createTextureManager, defineFuniture } from '../furniture.js';
 import { remap } from 'misskey-world/src/utility.js';
-import { poster_schema } from 'misskey-world/src/room/objects/poster.schema.js';
+import { poster_schema } from 'misskey-world/src/room/furnitures/poster.schema.js';
 
 export const poster = defineFuniture(poster_schema, {
 	createInstance: async ({ scene, options, model }) => {

packages/frontend-misskey-world-engine/src/room/furnitures/powerStrip.ts

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { defineFuniture } from '../object.js';
-import { powerStrip_schema } from 'misskey-world/src/room/objects/powerStrip.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { powerStrip_schema } from 'misskey-world/src/room/furnitures/powerStrip.schema.js';
 
 export const powerStrip = defineFuniture(powerStrip_schema, {
 	createInstance: () => {

packages/frontend-misskey-world-engine/src/room/furnitures/radiometer.ts

@@ -4,8 +4,8 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { defineFuniture } from '../object.js';
-import { radiometer_schema } from 'misskey-world/src/room/objects/radiometer.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { radiometer_schema } from 'misskey-world/src/room/furnitures/radiometer.schema.js';
 
 export const radiometer = defineFuniture(radiometer_schema, {
 	createInstance: ({ sr, scene, model }) => {

packages/frontend-misskey-world-engine/src/room/furnitures/randomBooks.ts

@@ -5,9 +5,9 @@
 
 import * as BABYLON from '@babylonjs/core';
 import seedrandom from 'seedrandom';
-import { defineFuniture } from '../object.js';
+import { defineFuniture } from '../furniture.js';
 import { cm, remap, WORLD_SCALE } from 'misskey-world/src/utility.js';
-import { randomBooks_schema } from 'misskey-world/src/room/objects/randomBooks.schema.js';
+import { randomBooks_schema } from 'misskey-world/src/room/furnitures/randomBooks.schema.js';
 
 export const randomBooks = defineFuniture(randomBooks_schema, {
 	createInstance: ({ options, model, scene }) => {

packages/frontend-misskey-world-engine/src/room/furnitures/recordPlayer.ts

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { defineFuniture } from '../object.js';
-import { recordPlayer_schema } from 'misskey-world/src/room/objects/recordPlayer.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { recordPlayer_schema } from 'misskey-world/src/room/furnitures/recordPlayer.schema.js';
 
 export const recordPlayer = defineFuniture(recordPlayer_schema, {
 	createInstance: () => {

packages/frontend-misskey-world-engine/src/room/furnitures/rolledUpPoster.ts

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { defineFuniture } from '../object.js';
-import { rolledUpPoster_schema } from 'misskey-world/src/room/objects/rolledUpPoster.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { rolledUpPoster_schema } from 'misskey-world/src/room/furnitures/rolledUpPoster.schema.js';
 
 export const rolledUpPoster = defineFuniture(rolledUpPoster_schema, {
 	createInstance: () => {

packages/frontend-misskey-world-engine/src/room/furnitures/roundRug.ts

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { defineFuniture } from '../object.js';
-import { roundRug_schema } from 'misskey-world/src/room/objects/roundRug.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { roundRug_schema } from 'misskey-world/src/room/furnitures/roundRug.schema.js';
 
 export const roundRug = defineFuniture(roundRug_schema, {
 	createInstance: () => {

packages/frontend-misskey-world-engine/src/room/furnitures/router.ts

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { defineFuniture } from '../object.js';
-import { router_schema } from 'misskey-world/src/room/objects/router.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { router_schema } from 'misskey-world/src/room/furnitures/router.schema.js';
 
 export const router = defineFuniture(router_schema, {
 	createInstance: () => {

packages/frontend-misskey-world-engine/src/room/furnitures/siphon.ts

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { defineFuniture } from '../object.js';
-import { siphon_schema } from 'misskey-world/src/room/objects/siphon.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { siphon_schema } from 'misskey-world/src/room/furnitures/siphon.schema.js';
 
 export const siphon = defineFuniture(siphon_schema, {
 	createInstance: () => {

packages/frontend-misskey-world-engine/src/room/furnitures/snakeplant.ts

@@ -4,8 +4,8 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { defineFuniture } from '../object.js';
-import { snakeplant_schema } from 'misskey-world/src/room/objects/snakeplant.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { snakeplant_schema } from 'misskey-world/src/room/furnitures/snakeplant.schema.js';
 
 export const snakeplant = defineFuniture(snakeplant_schema, {
 	createInstance: ({ options, model }) => {

packages/frontend-misskey-world-engine/src/room/furnitures/sofa.ts

@@ -4,8 +4,8 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { defineFuniture } from '../object.js';
-import { sofa_schema } from 'misskey-world/src/room/objects/sofa.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { sofa_schema } from 'misskey-world/src/room/furnitures/sofa.schema.js';
 
 export const sofa = defineFuniture(sofa_schema, {
 	createInstance: ({ options, model }) => {

packages/frontend-misskey-world-engine/src/room/furnitures/speaker.ts

@@ -4,8 +4,8 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { defineFuniture } from '../object.js';
-import { speaker_schema } from 'misskey-world/src/room/objects/speaker.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { speaker_schema } from 'misskey-world/src/room/furnitures/speaker.schema.js';
 
 export const speaker = defineFuniture(speaker_schema, {
 	createInstance: ({ options, model }) => {

packages/frontend-misskey-world-engine/src/room/furnitures/speakerStand.ts

@@ -4,8 +4,8 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { defineFuniture } from '../object.js';
-import { speakerStand_schema } from 'misskey-world/src/room/objects/speakerStand.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { speakerStand_schema } from 'misskey-world/src/room/furnitures/speakerStand.schema.js';
 
 export const speakerStand = defineFuniture(speakerStand_schema, {
 	createInstance: ({ options, model }) => {

packages/frontend-misskey-world-engine/src/room/furnitures/spotLight.ts

@@ -4,10 +4,10 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { defineFuniture } from '../object.js';
+import { defineFuniture } from '../furniture.js';
 import { getLightRangeFactorByGraphicsQuality } from '../utility.js';
 import { cm, remap, WORLD_SCALE } from 'misskey-world/src/utility.js';
-import { spotLight_schema } from 'misskey-world/src/room/objects/spotLight.schema.js';
+import { spotLight_schema } from 'misskey-world/src/room/furnitures/spotLight.schema.js';
 
 export const spotLight = defineFuniture(spotLight_schema, {
 	createInstance: ({ lc, scene, options, model, graphicsQuality }) => {

packages/frontend-misskey-world-engine/src/room/furnitures/sprayer.ts

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { defineFuniture } from '../object.js';
-import { sprayer_schema } from 'misskey-world/src/room/objects/sprayer.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { sprayer_schema } from 'misskey-world/src/room/furnitures/sprayer.schema.js';
 
 export const sprayer = defineFuniture(sprayer_schema, {
 	createInstance: () => {

packages/frontend-misskey-world-engine/src/room/furnitures/stanchionPole.ts

@@ -4,8 +4,8 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { defineFuniture } from '../object.js';
-import { stanchionPole_schema } from 'misskey-world/src/room/objects/stanchionPole.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { stanchionPole_schema } from 'misskey-world/src/room/furnitures/stanchionPole.schema.js';
 
 export const stanchionPole = defineFuniture(stanchionPole_schema, {
 	createInstance: ({ options, model }) => {

packages/frontend-misskey-world-engine/src/room/furnitures/steelRack.ts

@@ -4,9 +4,9 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { steelRack_schema } from 'misskey-world/src/room/objects/steelRack.schema.js';
+import { steelRack_schema } from 'misskey-world/src/room/furnitures/steelRack.schema.js';
 import { cm, remap } from 'misskey-world/src/utility.js';
-import { defineFuniture } from '../object.js';
+import { defineFuniture } from '../furniture.js';
 
 export const steelRack = defineFuniture(steelRack_schema, {
 	path: (options) => {

packages/frontend-misskey-world-engine/src/room/furnitures/stormGlass.ts

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { defineFuniture } from '../object.js';
-import { stormGlass_schema } from 'misskey-world/src/room/objects/stormGlass.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { stormGlass_schema } from 'misskey-world/src/room/furnitures/stormGlass.schema.js';
 
 export const stormGlass = defineFuniture(stormGlass_schema, {
 	createInstance: () => {

packages/frontend-misskey-world-engine/src/room/furnitures/tableSalt.ts

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { defineFuniture } from '../object.js';
-import { tableSalt_schema } from 'misskey-world/src/room/objects/tableSalt.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { tableSalt_schema } from 'misskey-world/src/room/furnitures/tableSalt.schema.js';
 
 export const tableSalt = defineFuniture(tableSalt_schema, {
 	createInstance: () => {

packages/frontend-misskey-world-engine/src/room/furnitures/tabletopCalendar.ts

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { defineFuniture } from '../object.js';
-import { tabletopCalendar_schema } from 'misskey-world/src/room/objects/tabletopCalendar.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { tabletopCalendar_schema } from 'misskey-world/src/room/furnitures/tabletopCalendar.schema.js';
 
 export const tabletopCalendar = defineFuniture(tabletopCalendar_schema, {
 	createInstance: () => {

packages/frontend-misskey-world-engine/src/room/furnitures/tabletopDigitalClock.ts

@@ -5,8 +5,8 @@
 
 import * as BABYLON from '@babylonjs/core';
 import { cm, WORLD_SCALE } from 'misskey-world/src/utility.js';
-import { tabletopDigitalClock_schema } from 'misskey-world/src/room/objects/tabletopDigitalClock.schema.js';
-import { defineFuniture } from '../object.js';
+import { tabletopDigitalClock_schema } from 'misskey-world/src/room/furnitures/tabletopDigitalClock.schema.js';
+import { defineFuniture } from '../furniture.js';
 import { get7segMeshesOfCurrentTime } from '../../utility.js';
 
 export const tabletopDigitalClock = defineFuniture(tabletopDigitalClock_schema, {

packages/frontend-misskey-world-engine/src/room/furnitures/tabletopFlag.ts

@@ -4,8 +4,8 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { createTextureManager, defineFuniture } from '../object.js';
-import { tabletopFlag_schema } from 'misskey-world/src/room/objects/tabletopFlag.schema.js';
+import { createTextureManager, defineFuniture } from '../furniture.js';
+import { tabletopFlag_schema } from 'misskey-world/src/room/furnitures/tabletopFlag.schema.js';
 
 export const tabletopFlag = defineFuniture(tabletopFlag_schema, {
 	createInstance: async ({ model, options, scene }) => {

packages/frontend-misskey-world-engine/src/room/furnitures/tabletopGlassPictureFrame.ts

@@ -4,9 +4,9 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { createTextureManager, defineFuniture } from '../object.js';
+import { createTextureManager, defineFuniture } from '../furniture.js';
 import { remap } from 'misskey-world/src/utility.js';
-import { tabletopGlassPictureFrame_schema } from 'misskey-world/src/room/objects/tabletopGlassPictureFrame.schema.js';
+import { tabletopGlassPictureFrame_schema } from 'misskey-world/src/room/furnitures/tabletopGlassPictureFrame.schema.js';
 
 export const tabletopGlassPictureFrame = defineFuniture(tabletopGlassPictureFrame_schema, {
 	createInstance: async ({ scene, options, model }) => {

packages/frontend-misskey-world-engine/src/room/furnitures/tabletopIronFrameStand.ts

@@ -4,8 +4,8 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { defineFuniture } from '../object.js';
-import { tabletopIronFrameStand_schema } from 'misskey-world/src/room/objects/tabletopIronFrameStand.schema.js';
+import { defineFuniture } from '../furniture.js';
+import { tabletopIronFrameStand_schema } from 'misskey-world/src/room/furnitures/tabletopIronFrameStand.schema.js';
 
 export const tabletopIronFrameStand = defineFuniture(tabletopIronFrameStand_schema, {
 	createInstance: ({ options, model }) => {

packages/frontend-misskey-world-engine/src/room/furnitures/tabletopLcdButtonsController.ts

@@ -4,8 +4,8 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { tabletopLcdButtonsController_schema } from 'misskey-world/src/room/objects/tabletopLcdButtonsController.schema.js';
-import { createTextureManager, defineFuniture } from '../object.js';
+import { tabletopLcdButtonsController_schema } from 'misskey-world/src/room/furnitures/tabletopLcdButtonsController.schema.js';
+import { createTextureManager, defineFuniture } from '../furniture.js';
 import { normalizeUvToSquare } from '../../utility.js';
 
 export const tabletopLcdButtonsController = defineFuniture(tabletopLcdButtonsController_schema, {

packages/frontend-misskey-world-engine/src/room/furnitures/tabletopPictureFrame.ts

@@ -4,8 +4,8 @@
  */
 
 import * as BABYLON from '@babylonjs/core';
-import { createTextureManager, defineFuniture } from '../object.js';
-import { tabletopPictureFrame_schema } from 'misskey-world/src/room/objects/tabletopPictureFrame.schema.js';
+import { createTextureManager, defineFuniture } from '../furniture.js';
+import { tabletopPictureFrame_schema } from 'misskey-world/src/room/furnitures/tabletopPictureFrame.schema.js';
 
 // NOTE: シェイプキーのnormalのエクスポートは無効にしないとmatを大きくしたときに面のレンダリングがグリッチする