@divinevoxel/vlox 0.0.72 → 0.0.74

package/World/Archive/Classes/ImportedSector.js

@@ -0,0 +1,97 @@
+import { StringPalette } from "../../../Util/StringPalette";
+import { NumberPalette } from "../../../Util/NumberPalette";
+import { ImportedSection } from "./ImportedSection";
+import { SchemaRegister } from "../../../Voxels/State/SchemaRegister";
+class ImportedSectorPalettes {
+    id;
+    secondaryId;
+    secondaryValue;
+    level;
+    light;
+    state = [];
+    secondaryState = [];
+    mod = [];
+    secondaryMod = [];
+    constructor(sector) {
+        for (let i = 0; i < sector.palettes.id.length; i++) {
+            const voxelId = sector.palettes.id[i];
+            if (!SchemaRegister.hasVoxelSchema(voxelId))
+                continue;
+            const schema = SchemaRegister.getVoxelSchemas(voxelId);
+            const stateMap = sector.palettes.stateMap[i];
+            if (stateMap) {
+                const stateArray = [];
+                for (let s = 0; s < stateMap.length; s++) {
+                    stateArray[s] = schema.state.fromStateObject(stateMap[s]);
+                }
+                this.state[i] = stateArray;
+            }
+            const modMap = sector.palettes.modMap[i];
+            if (modMap) {
+                const modArray = [];
+                for (let m = 0; m < modMap.length; m++) {
+                    modArray[m] = schema.mod.fromStateObject(modMap[m]);
+                }
+                this.mod[i] = modArray;
+            }
+        }
+        for (let i = 0; i < sector.palettes.secondaryId.length; i++) {
+            const voxelId = sector.palettes.secondaryId[i];
+            if (!SchemaRegister.hasVoxelSchema(voxelId))
+                continue;
+            const schema = SchemaRegister.getVoxelSchemas(voxelId);
+            const stateMap = sector.palettes.secondaryStateMap[i];
+            if (stateMap) {
+                const stateArray = [];
+                for (let s = 0; s < stateMap.length; s++) {
+                    stateArray[s] = schema.state.fromStateObject(stateMap[s]);
+                }
+                this.secondaryState[i] = stateArray;
+            }
+            const modMap = sector.palettes.secondaryModMap[i];
+            if (modMap) {
+                const modArray = [];
+                for (let m = 0; m < modMap.length; m++) {
+                    modArray[m] = schema.mod.fromStateObject(modMap[m]);
+                }
+                this.secondaryMod[i] = modArray;
+            }
+        }
+        this.id = new StringPalette(sector.palettes.id);
+        this.secondaryId = new StringPalette(sector.palettes.secondaryId);
+        this.secondaryValue = new NumberPalette(sector.palettes.secondaryValue);
+        this.level = sector.palettes.level
+            ? new NumberPalette(sector.palettes.level)
+            : undefined;
+        this.light = {
+            sun: sector.palettes.light.sun
+                ? new NumberPalette(sector.palettes.light.sun)
+                : null,
+            red: sector.palettes.light.red
+                ? new NumberPalette(sector.palettes.light.red)
+                : null,
+            green: sector.palettes.light.green
+                ? new NumberPalette(sector.palettes.light.green)
+                : null,
+            blue: sector.palettes.light.blue
+                ? new NumberPalette(sector.palettes.light.blue)
+                : null,
+        };
+    }
+}
+export class ImportedSector {
+    sector;
+    sections = [];
+    palettes;
+    constructor(sector) {
+        this.sector = sector;
+        this.palettes = new ImportedSectorPalettes(sector);
+        for (let sectionIndex = 0; sectionIndex < sector.sections.length; sectionIndex++) {
+            const archivedSectionValue = sector.sections[sectionIndex];
+            const archivedSection = typeof archivedSectionValue == "string"
+                ? sector.duplicates?.sections?.[archivedSectionValue]
+                : archivedSectionValue;
+            this.sections[sectionIndex] = new ImportedSection(sectionIndex, this, archivedSection);
+        }
+    }
+}

package/World/Archive/Functions/ArchiveArea.d.ts

@@ -1,6 +1,6 @@
 import { ArchivedAreaSectorData, ArchivedAreaData, ArchivedSectorData } from "../Archive.types";
 type RunData = {
-    dimension: string;
+    dimension: number;
     sectors: ArchivedSectorData[];
     version?: number;
 };

package/World/Archive/Functions/ArchiveArea.js

@@ -1,17 +1,6 @@
 import { BinaryObject } from "@amodx/binary";
-const charset = "0123456789ABCDEF";
-function uint16To4CharString(value) {
-    if (value < 0 || value > 0xffff) {
-        throw new RangeError("Value must be a 16-bit unsigned integer.");
-    }
-    const chars = [];
-    for (let i = 0; i < 4; i++) {
-        const charCode = (value >> (i * 4)) & 0x0f;
-        chars.unshift(charset[charCode]);
-    }
-    const result = chars.join("").replace(/^0+(?!$)/, "");
-    return result;
-}
+import { uint16To4CharString } from "./Shared";
+import { WorldRegister } from "World/WorldRegister";
 const processPalettes = (archiveData) => {
     const allRegistered = new Set();
     for (const sector of archiveData.sectors) {
@@ -190,17 +179,18 @@ const getPaletteMaps = (archiveData) => {
     createPaletteMaps(archiveData, "level", levelPalette, paletteMap);
     createPaletteMaps(archiveData, "level", levelPalette, paletteMap);
     paletteMap.clear();
-    const statePalette = {};
+    /*   const statePalette: Record<string, Uint16Array> = {};
     createPaletteMaps(archiveData, "state", statePalette, paletteMap);
     createPaletteMaps(archiveData, "state", statePalette, paletteMap);
     paletteMap.clear();
-    const modPalette = {};
+  
+    const modPalette: Record<string, Uint16Array> = {};
     createPaletteMaps(archiveData, "mod", modPalette, paletteMap);
     createPaletteMaps(archiveData, "mod", modPalette, paletteMap);
-    paletteMap.clear();
-    const secondaryStatePalette = {};
-    createPaletteMaps(archiveData, "secondaryState", secondaryStatePalette, paletteMap);
-    createPaletteMaps(archiveData, "secondaryState", secondaryStatePalette, paletteMap);
+    paletteMap.clear(); */
+    const secondaryValuePalette = {};
+    createPaletteMaps(archiveData, "secondaryValue", secondaryValuePalette, paletteMap);
+    createPaletteMaps(archiveData, "secondaryValue", secondaryValuePalette, paletteMap);
     paletteMap.clear();
     const idPalette = {};
     createPaletteMaps(archiveData, "id", idPalette, paletteMap);
@@ -215,9 +205,9 @@ const getPaletteMaps = (archiveData) => {
         secondaryIdPalette,
         levelPalette,
         lightPalette,
-        statePalette,
-        secondaryStatePalette,
-        modPalette,
+        statePalette: {},
+        secondaryValuePalette,
+        modPalette: {},
     };
 };
 function SectorToArchivedAreaSector(sector) {
@@ -225,19 +215,16 @@ function SectorToArchivedAreaSector(sector) {
     palettes.id = sector.palettes.id;
     if (sector.palettes.secondaryId)
         palettes.secondaryId = sector.palettes.secondaryId;
-    if (sector.palettes.light)
-        palettes.light = sector.palettes.light;
-    if (sector.palettes.secondaryState)
-        palettes.secondaryState = sector.palettes.secondaryState;
-    if (sector.palettes.state)
-        palettes.state = sector.palettes.state;
+    // if (sector.palettes.light) palettes.light = sector.palettes.light;
+    if (sector.palettes.secondaryValue)
+        palettes.secondaryValueState = sector.palettes.secondaryValue;
+    /*   if (sector.palettes.state) palettes.state = sector.palettes.state;
     sector.palettes.stateMap = sector.palettes.stateMap;
-    if (sector.palettes.mod)
-        palettes.state = sector.palettes.mod;
+    if (sector.palettes.mod) palettes.state = sector.palettes.mod; */
     sector.palettes.modMap = sector.palettes.modMap;
     return {
-        position: [sector.location[1], sector.location[2], sector.location[3]],
-        sectorState: sector.sectorState,
+        position: sector.location,
+        sectorState: sector.flags,
         buffers: sector.buffers,
         palettes,
         sections: sector.sections,
@@ -250,11 +237,12 @@ export default function CreateArchiveArea(archiveData) {
         sectors.push(SectorToArchivedAreaSector(sector));
     }
     return {
-        dimension: archiveData.dimension,
+        dimension: WorldRegister.dimensions.get(archiveData.dimension)?.id || "main",
         version: "",
         keys: {
             sectorState: sectorStateKeys,
-            sectionState: archiveData.sectors[0].keys.sectionState,
+            sectionState: [],
+            //   sectionState: archiveData.sectors[0].keys.sectionState,
         },
         maps: {
             sectorState: buildSectorState(archiveData),
@@ -285,24 +273,27 @@ export function CreateSectorFromArea(area, sector) {
         id[i] = area.maps.id[i];
     }
     palettes.id = id;
-    palettes.light =
-        typeof sector.palettes.light == "string"
-            ? area.maps.lightPalette[sector.palettes.light]
-            : sector.palettes.light;
+    /*   palettes.light =
+      typeof sector.palettes.light == "string"
+        ? area.maps.lightPalette[sector.palettes.light]
+        : sector.palettes.light;
+   */
     palettes.level =
         typeof sector.palettes.level == "string"
             ? area.maps.levelPalette[sector.palettes.level]
             : sector.palettes.level;
-    palettes.state =
-        typeof sector.palettes.state == "string"
-            ? area.maps.statePalette[sector.palettes.state]
-            : sector.palettes.state;
+    /*   palettes.state =
+      typeof sector.palettes.state == "string"
+        ? area.maps.statePalette[sector.palettes.state]
+        : sector.palettes.state!;
     palettes.stateMap = sector.palettes.stateMap;
+  
     palettes.mod =
-        typeof sector.palettes.mod == "string"
-            ? area.maps.statePalette[sector.palettes.mod]
-            : sector.palettes.mod;
+      typeof sector.palettes.mod == "string"
+        ? area.maps.statePalette[sector.palettes.mod]
+        : sector.palettes.mod!;
     palettes.modMap = sector.palettes.modMap;
+   */
     let secondaryId;
     if (typeof sector.palettes.secondaryId == "string") {
         secondaryId = area.maps.idPalette[sector.palettes.secondaryId];
@@ -314,10 +305,10 @@ export function CreateSectorFromArea(area, sector) {
         secondaryId[i] = area.maps.id[i];
     }
     palettes.secondaryId = secondaryId;
-    palettes.secondaryState =
-        typeof sector.palettes.secondaryState == "string"
-            ? area.maps.secondaryStatePalette[sector.palettes.secondaryState]
-            : sector.palettes.secondaryState;
+    palettes.secondaryValue =
+        typeof sector.palettes.secondaryValueState == "string"
+            ? area.maps.secondaryValuePalette[sector.palettes.secondaryValueState]
+            : sector.palettes.secondaryValueState;
     const sections = [];
     for (let i = 0; i < sector.sections.length; i++) {
         const section = sector.sections[i];
@@ -329,11 +320,15 @@ export function CreateSectorFromArea(area, sector) {
     }
     return {
         version: area.version,
-        location: [area.dimension, ...sector.position],
-        sectorState,
-        keys: {
-            sectionState: area.keys.sectionState,
-        },
+        vloxVersion: area.version,
+        dimension: "",
+        location: [...sector.position],
+        flags: sectorState,
+        timestamps: {},
+        /*     keys: {
+          sectionState: area.keys.sectionState,
+        }, */
+        duplicates: {},
         palettes,
         buffers: sector.buffers,
         sections,