@divinevoxel/vlox 0.0.72 → 0.0.73

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

@@ -1,9 +1,9 @@
-import { VoxelDataArrays, SectorData } from "../../index";
+import { SectionData, SectorData } from "../../index";
 import { ArchivedSectorData } from "../Archive.types";
 type RunData = {
     version?: number;
     loadColumnState?: (data: Record<string, any>, sector: SectorData) => void;
-    loadSectionState?: (keys: string[], data: any[], section: VoxelDataArrays) => void;
+    loadSectionState?: (keys: string[], data: any[], section: SectionData) => void;
 };
-export default function ImportSector(sector: ArchivedSectorData, archiveData: RunData): SectorData;
+export default function ImportSector(archivedSector: ArchivedSectorData, archiveData: RunData): SectorData;
 export {};

package/World/Archive/Functions/ImportSector.js

@@ -1,113 +1,168 @@
 import { Sector } from "../../index";
 import { NumberPalette } from "../../../Util/NumberPalette";
 import { StringPalette } from "../../../Util/StringPalette";
-import { getPaletteArray } from "../../../Util/Binary/Palettes";
 import { SchemaRegister } from "../../../Voxels/State/SchemaRegister";
 import { VoxelPalettesRegister } from "../../../Voxels/Data/VoxelPalettesRegister";
 import { VoxelTagsRegister } from "../../../Voxels/Data/VoxelTagsRegister";
-const updateSectionBuffers = (sector, section) => {
-    if ((sector.palettes.id.length <= 15 ||
-        (section.palettes.id && section.palettes.id.length <= 15)) &&
-        ArrayBuffer.isView(section.buffers.id)) {
-        section.buffers.id = getPaletteArray(Math.min(section.palettes.id?.length || Infinity, sector.palettes.id?.length || 0), section.buffers.id);
-    }
-    if (((section.palettes.light && section.palettes.light.length <= 15) ||
-        (sector.palettes.light && sector.palettes.light.length <= 15)) &&
-        ArrayBuffer.isView(section.buffers.light)) {
-        section.buffers.light = getPaletteArray(Math.min(section.palettes.light?.length || Infinity, sector.palettes.light?.length || 0), section.buffers.light);
-    }
-    if (((section.palettes.state && section.palettes.state.length <= 15) ||
-        (sector.palettes.state && sector.palettes.state.length <= 15)) &&
-        ArrayBuffer.isView(section.buffers.state)) {
-        section.buffers.state = getPaletteArray(Math.min(section.palettes.state?.length || Infinity, sector.palettes.state?.length || 0), section.buffers.state);
-    }
-    if (((section.palettes.mod && section.palettes.mod.length <= 15) ||
-        (sector.palettes.mod && sector.palettes.mod.length <= 15)) &&
-        ArrayBuffer.isView(section.buffers.mod)) {
-        section.buffers.mod = getPaletteArray(Math.min(section.palettes.mod?.length || Infinity, sector.palettes.mod?.length || 0), section.buffers.mod);
-    }
-    if (((section.palettes.secondaryState &&
-        section.palettes.secondaryState.length <= 15) ||
-        (sector.palettes.secondaryState &&
-            sector.palettes.secondaryState.length <= 15)) &&
-        ((section.palettes.secondaryId &&
-            section.palettes.secondaryId.length <= 15) ||
-            (sector.palettes.secondaryId &&
-                sector.palettes.secondaryId.length <= 15)) &&
-        ArrayBuffer.isView(section.buffers.secondary)) {
-        section.buffers.secondary = getPaletteArray(Math.max(Math.min(section.palettes.secondaryId?.length || Infinity, sector.palettes.secondaryId?.length || 0), Math.min(section.palettes.secondaryState?.length || Infinity, sector.palettes.secondaryState?.length || 0)), section.buffers.secondary);
-    }
-};
-const getImportedColumnData = (sector) => {
+import { BinaryBuffer } from "../../../Util/Binary/BinaryBuffer";
+import { lightSegments, lightSemgnetSet } from "./Shared";
+const getImportedSectorData = (sector) => {
     return {
         sector,
         idPalette: new StringPalette(sector.palettes.id),
-        secondaryId: sector.palettes.secondaryId
-            ? new StringPalette(sector.palettes.secondaryId)
-            : undefined,
-        lightPalette: sector.palettes.light
-            ? new NumberPalette(sector.palettes.light)
-            : undefined,
-        statePalette: sector.palettes.state
-            ? new NumberPalette(sector.palettes.state)
-            : undefined,
-        modPalette: sector.palettes.mod
-            ? new NumberPalette(sector.palettes.mod)
-            : undefined,
-        secondaryState: sector.palettes.secondaryState
-            ? new NumberPalette(sector.palettes.secondaryState)
+        secondaryId: new StringPalette(sector.palettes.secondaryId),
+        levelPalette: sector.palettes.level
+            ? new NumberPalette(sector.palettes.level)
             : undefined,
+        lightPalette: {
+            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,
+        },
+        statePalette: new NumberPalette(sector.palettes.state),
+        modPalette: new NumberPalette(sector.palettes.mod),
+        secondaryState: new NumberPalette(sector.palettes.secondaryState),
     };
 };
 const getImportedSectionData = (section) => {
     return {
         section,
-        idPalette: section.palettes.id
-            ? new NumberPalette(section.palettes.id)
+        buffers: {
+            ids: !section.buffers.id
+                ? new BinaryBuffer({ buffer: 0 })
+                : typeof section.buffers.id == "number"
+                    ? new BinaryBuffer({ buffer: section.buffers.id })
+                    : new BinaryBuffer(section.buffers.id),
+            level: !section.buffers.level
+                ? new BinaryBuffer({ buffer: 0 })
+                : typeof section.buffers.level == "number"
+                    ? new BinaryBuffer({ buffer: section.buffers.level })
+                    : new BinaryBuffer(section.buffers.level),
+            light: {
+                sun: !section.buffers.light?.sun
+                    ? new BinaryBuffer({ buffer: 0 })
+                    : typeof section.buffers.light.sun == "number"
+                        ? new BinaryBuffer({ buffer: section.buffers.light.sun })
+                        : new BinaryBuffer(section.buffers.light.sun),
+                red: !section.buffers.light?.red
+                    ? new BinaryBuffer({ buffer: 0 })
+                    : typeof section.buffers.light.red == "number"
+                        ? new BinaryBuffer({ buffer: section.buffers.light.red })
+                        : new BinaryBuffer(section.buffers.light.red),
+                green: !section.buffers.light?.green
+                    ? new BinaryBuffer({ buffer: 0 })
+                    : typeof section.buffers.light.green == "number"
+                        ? new BinaryBuffer({ buffer: section.buffers.light.green })
+                        : new BinaryBuffer(section.buffers.light.green),
+                blue: !section.buffers.light?.blue
+                    ? new BinaryBuffer({ buffer: 0 })
+                    : typeof section.buffers.light.blue == "number"
+                        ? new BinaryBuffer({ buffer: section.buffers.light.blue })
+                        : new BinaryBuffer(section.buffers.light.blue),
+            },
+            state: !section.buffers.state
+                ? new BinaryBuffer({ buffer: 0 })
+                : typeof section.buffers.state == "number"
+                    ? new BinaryBuffer({ buffer: section.buffers.state })
+                    : new BinaryBuffer(section.buffers.state),
+            mod: !section.buffers.mod
+                ? new BinaryBuffer({ buffer: 0 })
+                : typeof section.buffers.mod == "number"
+                    ? new BinaryBuffer({ buffer: section.buffers.mod })
+                    : new BinaryBuffer(section.buffers.mod),
+            secondary: !section.buffers.secondary
+                ? new BinaryBuffer({ buffer: 0 })
+                : typeof section.buffers.secondary == "number"
+                    ? new BinaryBuffer({ buffer: section.buffers.secondary })
+                    : new BinaryBuffer(section.buffers.secondary),
+        },
+        idPalette: section.palettes?.id
+            ? new NumberPalette(section.palettes?.id)
             : undefined,
-        lightPalette: section.palettes.light
-            ? new NumberPalette(section.palettes.light)
+        lightPalette: {
+            sun: section.palettes?.light?.sun
+                ? new NumberPalette(section.palettes?.light?.sun)
+                : null,
+            red: section.palettes?.light?.red
+                ? new NumberPalette(section.palettes?.light?.red)
+                : null,
+            green: section.palettes?.light?.green
+                ? new NumberPalette(section.palettes?.light?.green)
+                : null,
+            blue: section.palettes?.light?.blue
+                ? new NumberPalette(section.palettes?.light?.blue)
+                : null,
+        },
+        levelPalette: section.palettes?.level
+            ? new NumberPalette(section.palettes?.level)
             : undefined,
-        statePalette: section.palettes.state
-            ? new NumberPalette(section.palettes.state)
+        statePalette: section.palettes?.state
+            ? new NumberPalette(section.palettes?.state)
             : undefined,
-        modPalette: section.palettes.mod
-            ? new NumberPalette(section.palettes.mod)
+        modPalette: section.palettes?.mod
+            ? new NumberPalette(section.palettes?.mod)
             : undefined,
-        secondaryState: section.palettes.secondaryState
-            ? new NumberPalette(section.palettes.secondaryState)
+        secondaryState: section.palettes?.secondaryState
+            ? new NumberPalette(section.palettes?.secondaryState)
             : undefined,
-        secondaryId: section.palettes.secondaryId
-            ? new NumberPalette(section.palettes.secondaryId)
+        secondaryId: section.palettes?.secondaryId
+            ? new NumberPalette(section.palettes?.secondaryId)
             : undefined,
     };
 };
-const getId = (value, importedColumn, importedSection) => {
-    if (importedSection.section.buffers.state instanceof Uint16Array)
-        return value;
-    if (typeof importedSection.section.buffers.id == "number") {
-        return VoxelPalettesRegister.voxels.getNumberId(importedColumn.sector.palettes.id[importedSection.section.buffers.id]);
+const getId = (value, importedSector, importedSection) => {
+    if (importedSection.buffers.ids.type == "value") {
+        return VoxelPalettesRegister.voxels.getNumberId(importedSector.idPalette.getStringId(value));
     }
     if (importedSection.idPalette) {
-        return VoxelPalettesRegister.voxels.getNumberId(importedColumn.idPalette.getStringId(importedSection.idPalette.getValue(value)));
+        return VoxelPalettesRegister.voxels.getNumberId(importedSector.idPalette.getStringId(importedSection.idPalette.getValue(value)));
     }
-    return VoxelPalettesRegister.voxels.getNumberId(importedColumn.idPalette.getStringId(value));
+    return VoxelPalettesRegister.voxels.getNumberId(importedSector.idPalette.getStringId(value));
 };
-const getLight = (value, importedColumn, importedSection) => {
-    if (importedSection.section.buffers.light instanceof Uint16Array)
-        return value;
-    if (typeof importedSection.section.buffers.light == "number") {
-        return value;
+const getLight = (index, importedSector, importedSection) => {
+    let finalLight = 0;
+    for (let l = 0; l < lightSegments.length; l++) {
+        const segment = lightSegments[l];
+        let value = 0;
+        if (importedSection.buffers.light[segment].type == "value") {
+            value = importedSection.buffers.light[segment].getValue(index);
+        }
+        else {
+            if (importedSection.buffers.light[segment].type == "4-bit") {
+                value = importedSection.buffers.light[segment].getValue(index);
+            }
+            else {
+                if (importedSection.lightPalette[segment]) {
+                    value = importedSection.lightPalette[segment].getValue(importedSection.buffers.light[segment].getValue(index));
+                }
+                else if (importedSector.lightPalette[segment]) {
+                    value = importedSector.lightPalette[segment].getValue(importedSection.buffers.light[segment].getValue(index));
+                }
+            }
+        }
+        finalLight = lightSemgnetSet[segment](value, finalLight);
     }
-    if (importedSection.lightPalette) {
-        return importedSection.lightPalette.getValue(value);
+    return finalLight;
+};
+const getLevel = (value, importedSector, importedSection) => {
+    if (importedSection.levelPalette) {
+        return importedSection.levelPalette.getValue(value);
     }
-    if (importedColumn.lightPalette) {
-        return importedColumn.lightPalette.getValue(value);
+    if (importedSector.levelPalette) {
+        return importedSector.levelPalette.getValue(value);
     }
     return value;
 };
-const getState = (voxelId, value, processedState, importedColumn, importedSection) => {
+const getState = (voxelId, value, processedState, importedSector, importedSection) => {
     const voxelStringId = VoxelPalettesRegister.voxels.getStringId(voxelId);
     if (!SchemaRegister.hasVoxelSchema(voxelStringId))
         return value;
@@ -119,16 +174,16 @@ const getState = (voxelId, value, processedState, importedColumn, importedSectio
     if (importedSection.statePalette) {
         stateId = importedSection.statePalette.getValue(value);
     }
-    else if (importedColumn.statePalette) {
+    else if (importedSector.statePalette) {
         stateId = value;
     }
     if (processedState[stateId] !== undefined)
         return processedState[stateId];
-    value = SchemaRegister.getVoxelSchemas(voxelStringId).state.fromStateObject(importedColumn.sector.palettes.stateMap[stateId]);
+    value = SchemaRegister.getVoxelSchemas(voxelStringId).state.fromStateObject(importedSector.sector.palettes.stateMap[stateId]);
     processedState[stateId] = value;
     return value;
 };
-const getMod = (voxelId, value, processedMod, importedColumn, importedSection) => {
+const getMod = (voxelId, value, processedMod, importedSector, importedSection) => {
     const voxelStringId = VoxelPalettesRegister.voxels.getStringId(voxelId);
     if (!SchemaRegister.hasVoxelSchema(voxelStringId))
         return value;
@@ -140,88 +195,94 @@ const getMod = (voxelId, value, processedMod, importedColumn, importedSection) =
     if (importedSection.modPalette) {
         modId = importedSection.modPalette.getValue(value);
     }
-    else if (importedColumn.modPalette) {
+    else if (importedSector.modPalette) {
         modId = value;
     }
     if (processedMod[modId] !== undefined)
         return processedMod[modId];
-    value = SchemaRegister.getVoxelSchemas(voxelStringId).mod.fromStateObject(importedColumn.sector.palettes.modMap[modId]);
+    value = SchemaRegister.getVoxelSchemas(voxelStringId).mod.fromStateObject(importedSector.sector.palettes.modMap[modId]);
     processedMod[modId] = value;
     return value;
 };
-const getSecondary = (voxelId, value, importedColumn, importedSection) => {
+const getSecondary = (voxelId, value, importedSector, importedSection) => {
     if (VoxelTagsRegister.VoxelTags[voxelId]["dve_can_have_secondary"]) {
-        if (typeof importedSection.section.buffers.secondary == "number") {
-            return VoxelPalettesRegister.voxels.getNumberId(importedColumn.sector.palettes.secondaryId[importedSection.section.buffers.secondary]);
-        }
         if (importedSection.secondaryId) {
-            return VoxelPalettesRegister.voxels.getNumberId(importedColumn.secondaryId.getStringId(importedSection.secondaryId.getValue(value)));
+            return VoxelPalettesRegister.voxels.getNumberId(importedSector.secondaryId.getStringId(importedSection.secondaryId.getValue(value)));
         }
-        return VoxelPalettesRegister.voxels.getNumberId(importedColumn.sector.palettes.secondaryId[value]);
+        return VoxelPalettesRegister.voxels.getNumberId(importedSector.sector.palettes.secondaryId[value]);
     }
     if (typeof importedSection.section.buffers.secondary == "number") {
         return value;
     }
-    if (importedSection.secondaryState && importedColumn.secondaryState) {
-        return importedColumn.secondaryState.getValue(importedSection.secondaryState.getValue(value));
+    if (importedSection.secondaryState && importedSector.secondaryState) {
+        return importedSector.secondaryState.getValue(importedSection.secondaryState.getValue(value));
     }
-    if (importedColumn.secondaryState) {
-        return importedColumn.secondaryState.getId(value);
+    if (importedSector.secondaryState) {
+        return importedSector.secondaryState.getId(value);
     }
     return value;
 };
-export default function ImportSector(sector, archiveData) {
-    const newSector = new Sector(Sector.CreateNew());
-    newSector.position[0] = sector.location[1];
-    newSector.position[1] = sector.location[2];
-    newSector.position[2] = sector.location[3];
-    if (!archiveData.loadColumnState) {
-        //sectorStructInstance.deserialize(sector.sectorState);
-    }
-    else {
-        archiveData.loadColumnState(sector.sectorState, newSector);
-    }
-    const importedSector = getImportedColumnData(sector);
+export default function ImportSector(archivedSector, archiveData) {
+    const sector = new Sector(Sector.CreateNew(), [
+        archivedSector.location[1],
+        archivedSector.location[2],
+        archivedSector.location[3],
+    ]);
+    sector.loadFlags(archivedSector.flags);
+    sector.loadTimestamps(archivedSector.timestamps);
+    const importedSector = getImportedSectorData(archivedSector);
     const processedState = {};
     const processedMod = {};
-    for (let sectionIndex = 0; sectionIndex < sector.sections.length; sectionIndex++) {
+    for (let sectionIndex = 0; sectionIndex < archivedSector.sections.length; sectionIndex++) {
+        const archivedSectionValue = archivedSector.sections[sectionIndex];
+        const archivedSection = typeof archivedSectionValue == "string"
+            ? archivedSector.duplicates?.sections?.[archivedSectionValue]
+            : archivedSectionValue;
+        const importedSection = getImportedSectionData(archivedSection);
         const section = sector.sections[sectionIndex];
-        const importedSection = getImportedSectionData(section);
-        const newSection = newSector.sections[sectionIndex];
-        const sectionState = {};
-        for (let i = 0; i < sector.keys.sectionState.length; i++) {
-            sectionState[sector.keys.sectionState[i]] = section.state[i];
+        archivedSection.flags && section.loadFlags(archivedSection.flags);
+        if (!ArrayBuffer.isView(archivedSection.buffers.buried)) {
+            for (let i = 0; i < section.buried.length; i++) {
+                section.buried[i] = archivedSection.buffers.buried || 0;
+            }
+        }
+        else {
+            for (let i = 0; i < section.buried.length; i++) {
+                section.buried[i] = archivedSection.buffers.buried[i];
+            }
+        }
+        if (!ArrayBuffer.isView(archivedSection.buffers.voxelMap)) {
+            for (let i = 0; i < section.voxelMap.length; i++) {
+                section.voxelMap[i] = archivedSection.buffers.voxelMap || 0;
+            }
+        }
+        else {
+            for (let i = 0; i < section.voxelMap.length; i++) {
+                section.voxelMap[i] = archivedSection.buffers.voxelMap[i];
+            }
+        }
+        if (!ArrayBuffer.isView(archivedSection.buffers.dirtyMap)) {
+            for (let i = 0; i < section.dirtyMap.length; i++) {
+                section.dirtyMap[i] = archivedSection.buffers.dirtyMap || 0;
+            }
+        }
+        else {
+            for (let i = 0; i < section.dirtyMap.length; i++) {
+                section.dirtyMap[i] = archivedSection.buffers.dirtyMap[i];
+            }
         }
-        updateSectionBuffers(sector, section);
-        /* if (!archiveData.loadSectionState) {
-          sectionStructInstance.setData(newSection.sectionState);
-          sectionStructInstance.deserialize(sectionState);
-        } else {
-          archiveData.loadSectionState(
-            sector.keys.sectionState,
-            section.state,
-            newSection
-          );
-        } */
-        for (let i = 0; i < newSection.ids.length; i++) {
-            newSection.ids[i] = getId(typeof section.buffers.id == "number"
-                ? section.buffers.id
-                : section.buffers.id[i], importedSector, importedSection);
-            newSection.light[i] = getLight(typeof section.buffers.light == "number"
-                ? section.buffers.light
-                : section.buffers.light[i], importedSector, importedSection);
-            newSection.secondary[i] = getSecondary(newSection.ids[i], typeof section.buffers.secondary == "number"
-                ? section.buffers.secondary
-                : section.buffers.secondary[i], importedSector, importedSection);
-            let secondary = VoxelTagsRegister.VoxelTags[newSection.ids[i]]["dve_can_have_secondary"] && newSection.secondary[i] > 0;
-            newSection.state[i] = getState(secondary ? newSection.secondary[i] : newSection.ids[i], typeof section.buffers.state == "number"
-                ? section.buffers.state
-                : section.buffers.state[i], processedState, importedSector, importedSection);
-            newSection.mod[i] = getMod(secondary ? newSection.secondary[i] : newSection.ids[i], typeof section.buffers.mod == "number"
-                ? section.buffers.mod
-                : section.buffers.mod[i], processedMod, importedSector, importedSection);
+        for (let i = 0; i < section.ids.length; i++) {
+            section.ids[i] = getId(importedSection.buffers.ids.getValue(i), importedSector, importedSection);
+            section.level[i] = getLevel(importedSection.buffers.level.getValue(i), importedSector, importedSection);
+            section.light[i] = getLight(i, importedSector, importedSection);
+            section.secondary[i] = getSecondary(section.ids[i], importedSection.buffers.secondary.getValue(i), importedSector, importedSection);
+            let secondary = VoxelTagsRegister.VoxelTags[section.ids[i]]["dve_can_have_secondary"] &&
+                section.secondary[i] > 0;
+            section.state[i] = getState(secondary ? section.secondary[i] : section.ids[i], importedSection.buffers.state.getValue(i), processedState, importedSector, importedSection);
+            section.mod[i] = getMod(secondary ? section.secondary[i] : section.ids[i], importedSection.buffers.mod.getValue(i), processedMod, importedSector, importedSection);
         }
-        newSector.sections[sectionIndex] = newSection;
+        sector.sections[sectionIndex] = section;
     }
-    return newSector;
+    sector.setBitFlag(Sector.FlagIds.isStored, true);
+    return sector;
 }

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

@@ -0,0 +1,6 @@
+import { ArchivedLightSegments, ArchivedSectionData } from "../Archive.types";
+export declare const lightSegments: ArchivedLightSegments[];
+export declare const lightSemgnetGet: Record<ArchivedLightSegments, (value: number) => number>;
+export declare const lightSemgnetSet: Record<ArchivedLightSegments, (value: number, source: number) => number>;
+export declare function uint16To4CharString(value: number): string;
+export declare function compareSection(section1: ArchivedSectionData, section2: ArchivedSectionData): boolean;

package/World/Archive/Functions/Shared.js

@@ -0,0 +1,75 @@
+import { VoxelLightData } from "../../../Voxels/Cursor/VoxelLightData";
+const lightData = new VoxelLightData();
+export const lightSegments = [
+    "sun",
+    "red",
+    "green",
+    "blue",
+];
+export const lightSemgnetGet = {
+    sun: (value) => lightData.getS(value),
+    red: (value) => lightData.getR(value),
+    green: (value) => lightData.getG(value),
+    blue: (value) => lightData.getB(value),
+};
+export const lightSemgnetSet = {
+    sun: (value, source) => lightData.setS(value, source),
+    red: (value, source) => lightData.setR(value, source),
+    green: (value, source) => lightData.setG(value, source),
+    blue: (value, source) => lightData.setB(value, source),
+};
+const charset = "0123456789ABCDEF";
+export 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;
+}
+function traverseSection(source, target) {
+    for (const key in source) {
+        if (!(key in target))
+            return false;
+        const sourceValue = source[key];
+        const targetValue = target[key];
+        if (!ArrayBuffer.isView(sourceValue) &&
+            typeof sourceValue === "object" &&
+            sourceValue !== null &&
+            !ArrayBuffer.isView(targetValue) &&
+            typeof targetValue == "object" &&
+            targetValue !== null) {
+            if (!traverseSection(sourceValue, targetValue))
+                return false;
+            continue;
+        }
+        if (typeof sourceValue === "number" ||
+            typeof sourceValue === "string" ||
+            typeof targetValue === "number" ||
+            typeof targetValue === "string") {
+            if (sourceValue !== targetValue)
+                return false;
+            continue;
+        }
+        if (sourceValue instanceof Uint8Array ||
+            sourceValue instanceof Uint16Array) {
+            if (!(targetValue instanceof sourceValue.constructor))
+                return false;
+            if (sourceValue.length !== targetValue.length)
+                return false;
+            let target = targetValue;
+            for (let i = 0; i < target.length; i++) {
+                if (sourceValue[i] != target[i])
+                    return false;
+            }
+        }
+    }
+    return true;
+}
+export function compareSection(section1, section2) {
+    return traverseSection(section1, section2);
+}

package/World/Archive/InitTasks.js

@@ -11,27 +11,37 @@ function runArchiveSector(location) {
         location: location,
     });
     const transfers = [];
-    if (archived.palettes.light)
-        transfers.push(archived.palettes.light.buffer);
+    // if (archived.palettes.light) transfers.push(archived.palettes.light.buffer);
     if (archived.palettes.state)
         transfers.push(archived.palettes.state.buffer);
     if (archived.palettes.secondaryState)
         transfers.push(archived.palettes.secondaryState.buffer);
     for (const section of archived.sections) {
-        if (typeof section.buffers.id != "number")
+        if (typeof section == "string")
+            continue;
+        if (ArrayBuffer.isView(section.buffers.id?.buffer))
             transfers.push(section.buffers.id.buffer);
-        if (typeof section.buffers.light != "number")
-            transfers.push(section.buffers.light.buffer);
-        if (typeof section.buffers.state != "number")
+        if (ArrayBuffer.isView(section.buffers.state?.buffer))
             transfers.push(section.buffers.state.buffer);
-        if (typeof section.buffers.secondary != "number")
-            transfers.push(section.buffers.secondary.buffer);
-        if (typeof section.buffers.mod != "number")
+        if (ArrayBuffer.isView(section.buffers.mod?.buffer))
             transfers.push(section.buffers.mod.buffer);
+        if (ArrayBuffer.isView(section.buffers.state?.buffer))
+            transfers.push(section.buffers.state.buffer);
+        if (ArrayBuffer.isView(section.buffers.light?.sun?.buffer))
+            transfers.push((section.buffers.light?.sun).buffer);
+        if (ArrayBuffer.isView(section.buffers.light?.red?.buffer))
+            transfers.push((section.buffers.light?.red).buffer);
+        if (ArrayBuffer.isView(section.buffers.light?.green?.buffer))
+            transfers.push((section.buffers.light?.green).buffer);
+        if (ArrayBuffer.isView(section.buffers.light?.blue?.buffer))
+            transfers.push((section.buffers.light?.blue).buffer);
+        if (ArrayBuffer.isView(section.buffers.secondary?.buffer))
+            transfers.push(section.buffers.secondary.buffer);
+        if (!section.palettes)
+            continue;
         if (section.palettes.id)
             transfers.push(section.palettes.id.buffer);
-        if (section.palettes.light)
-            transfers.push(section.palettes.light.buffer);
+        //   if (section.palettes.light) transfers.push(section.palettes.light.buffer);
         if (section.palettes.state)
             transfers.push(section.palettes.state.buffer);
         if (section.palettes.mod)
@@ -49,8 +59,15 @@ export default function InitTasks(props) {
     });
     Threads.registerTask("archive-sector-binary", async (location) => {
         const [archived] = runArchiveSector(location);
-        const compressed = await compressBinaryObject(archived);
-        return [compressed, [compressed]];
+        try {
+            const compressed = await compressBinaryObject(archived);
+            return [compressed, [compressed]];
+        }
+        catch (error) {
+            console.log(archived);
+            console.error(error);
+        }
+        return [null, []];
     });
     Threads.registerTask("import-sector", async (archived) => {
         const importedSector = ImportSector(archived, {});

package/World/Cursor/SectionCursor.d.ts

@@ -1,9 +1,9 @@
 import { WorldVoxelCursor } from "./WorldVoxelCursor";
 import { Vector3Like } from "@amodx/math";
-import { DataCursorInterface } from "../../Tools/DataCursor.interface";
+import { DataCursorInterface } from "../../Voxels/Cursor/DataCursor.interface";
 import { WorldSectionCursorInterface } from "./WorldSectionCursor.interface";
 import type { Section } from "../Section/index";
-export declare class SectionCursor extends DataCursorInterface implements WorldSectionCursorInterface {
+export declare class SectionCursor implements DataCursorInterface, WorldSectionCursorInterface {
     _section: Section | null;
     private voxel;
     _voxelIndex: number;

package/World/Cursor/SectionCursor.js

@@ -2,8 +2,7 @@ import { WorldRegister } from "../WorldRegister";
 import { WorldVoxelCursor } from "./WorldVoxelCursor";
 import { WorldSpaces } from "../WorldSpaces";
 import { Vector3Like } from "@amodx/math";
-import { DataCursorInterface } from "../../Tools/DataCursor.interface";
-export class SectionCursor extends DataCursorInterface {
+export class SectionCursor {
     _section;
     voxel = new WorldVoxelCursor(this);
     _voxelIndex = 0;
@@ -39,7 +38,7 @@ export class SectionCursor extends DataCursorInterface {
         const sector = WorldRegister.sectors.get(sectionOrDimension, x || 0, y || 0, z || 0);
         if (!sector)
             return false;
-        this._section = sector.getSection(y || 0);
+        this._section = sector.getSection(x || 0, y || 0, z || 0);
         const sectionPos = this._section.getPosition();
         this._sectionPosition.x = sectionPos[0];
         this._sectionPosition.y = sectionPos[1];

package/World/Cursor/SectorCursor.d.ts

@@ -2,9 +2,9 @@ import type { Section } from "../Section/index";
 import type { Sector } from "../Sector/index";
 import { WorldVoxelCursor } from "./WorldVoxelCursor";
 import { Vector3Like } from "@amodx/math";
-import { DataCursorInterface } from "../../Tools/DataCursor.interface";
+import { DataCursorInterface } from "../../Voxels/Cursor/DataCursor.interface";
 import { WorldSectionCursorInterface } from "./WorldSectionCursor.interface";
-export declare class SectorCursor extends DataCursorInterface implements WorldSectionCursorInterface {
+export declare class SectorCursor implements DataCursorInterface, WorldSectionCursorInterface {
     _current: Sector | null;
     _section: Section | null;
     private voxel;

package/World/Cursor/SectorCursor.js

@@ -2,8 +2,7 @@ import { WorldRegister } from "../WorldRegister";
 import { WorldVoxelCursor } from "./WorldVoxelCursor";
 import { WorldSpaces } from "../WorldSpaces";
 import { Vector3Like } from "@amodx/math";
-import { DataCursorInterface } from "../../Tools/DataCursor.interface";
-export class SectorCursor extends DataCursorInterface {
+export class SectorCursor {
     _current = null;
     _section;
     voxel = new WorldVoxelCursor(this);