@divinevoxel/vlox 0.0.72 → 0.0.73

package/World/Archive/Archive.types.d.ts

@@ -1,45 +1,46 @@
 import { Vec3Array } from "@amodx/math";
 import { LocationData } from "../../Math";
+import { BinaryBufferData } from "../../Util/Binary/BinaryBuffer";
+export type ArchivedLightSegments = "sun" | "red" | "green" | "blue";
 /**
  * Interface for an archived sector.
  */
 export interface ArchivedSectorData {
-    /** The version of vlox the data was stored in. */
+    /** A user provided version of the data. */
     version: string;
+    /** The version of vlox the data was stored in. */
+    vloxVersion: string;
     /** The location of the sector in the world. */
     location: LocationData;
-    /** Record of the sector's state, storing dynamic or user-defined data. */
-    sectorState: Record<string, any>;
+    /** Record of the sector's bit flags.  */
+    flags: Record<string, boolean>;
+    /** Record of the sector's timestamps. */
+    timestamps: Record<string, number>;
     /** The palette data used within the sector. */
     palettes: ArchivedSectorPaletteData;
     /** Placeholder for future buffer data. */
     buffers: ArchivedSectorBuffersData;
-    /** Keys associated with section states and other objects. */
-    keys: ArchivedSectorKeysData;
+    duplicates: ArchivedSectorDuplicteData;
     /** Array of archived section data within the sector. */
-    sections: ArchivedSectionData[];
+    sections: (ArchivedSectionData | string)[];
+}
+export interface ArchivedSectorDuplicteData {
+    sections?: Record<string, ArchivedSectionData>;
 }
 /**
  * Interface for the palettes of an archived sector.
  */
 export interface ArchivedSectorPaletteData {
     id: string[];
-    secondaryId?: string[];
-    level?: Uint8Array;
-    stateMap: Record<number, any[]>;
-    modMap: Record<number, any[]>;
+    secondaryId: string[];
     state: Uint16Array;
+    stateMap: Record<number, any[]>;
     mod: Uint16Array;
-    light?: Uint16Array;
+    modMap: Record<number, any[]>;
+    level?: Uint8Array;
+    light: Partial<Record<ArchivedLightSegments, Uint8Array>>;
     secondaryState?: Uint16Array;
 }
-/**
- * Interface for the keys of an archived sector.
- */
-export interface ArchivedSectorKeysData {
-    /** Array of strings that are the keys for the section state struct.  */
-    sectionState: string[];
-}
 /**
  * Placeholder interface for future buffer data in a sector.
  */
@@ -49,10 +50,10 @@ export interface ArchivedSectorBuffersData {
  * Interface for an archived section.
  */
 export interface ArchivedSectionData {
-    /** Array representing the section's state, holding dynamic or user-defined data. */
-    state: any[];
+    /** Record of the sections's bit flags.  */
+    flags?: Record<string, boolean>;
     /** Palette data used within the section. */
-    palettes: ArchivedSectionPaletteData;
+    palettes?: ArchivedSectionPaletteData;
     /** Buffer data for the section, holding voxel type identifiers, light data, state, and secondary state. */
     buffers: ArchivedSectionBuffers;
 }
@@ -61,7 +62,7 @@ export interface ArchivedSectionData {
  */
 export interface ArchivedSectionPaletteData {
     id?: Uint16Array;
-    light?: Uint16Array;
+    light?: Partial<Record<ArchivedLightSegments, Uint8Array>>;
     level?: Uint8Array;
     secondaryId?: Uint16Array;
     state?: Uint16Array;
@@ -72,12 +73,15 @@ export interface ArchivedSectionPaletteData {
  * Interface representing the buffer data for a section.
  */
 export interface ArchivedSectionBuffers {
-    id: Uint16Array | Uint8Array | number;
-    light: Uint16Array | Uint8Array | number;
-    level: Uint8Array | number;
-    state: Uint16Array | Uint8Array | number;
-    mod: Uint16Array | Uint8Array | number;
-    secondary: Uint16Array | Uint8Array | number;
+    buried?: Uint8Array | number;
+    voxelMap?: Uint8Array | number;
+    dirtyMap?: Uint8Array | number;
+    id?: BinaryBufferData | number;
+    light?: Partial<Record<ArchivedLightSegments, BinaryBufferData | number>>;
+    level?: BinaryBufferData | number;
+    state?: BinaryBufferData | number;
+    mod?: BinaryBufferData | number;
+    secondary?: BinaryBufferData | number;
 }
 /**
  * Interface for an archived area.
@@ -133,14 +137,14 @@ export interface ArchivedAreaKeysData {
  */
 export interface ArchivedAreaSectorPaletteData {
     id: string[];
-    light?: Uint16Array;
-    level?: Uint8Array;
-    state?: Uint16Array;
-    mod?: Uint16Array;
+    light: Uint16Array;
+    level: Uint8Array;
+    state: Uint16Array;
+    mod: Uint16Array;
     stateMap: Record<number, any[]>;
     modMap: Record<number, any[]>;
-    secondaryId?: string[];
-    secondaryState?: Uint16Array;
+    secondaryId: string[];
+    secondaryState: Uint16Array;
 }
 /**
  * Interface representing the archived data for a sector within an area.

package/World/Archive/Functions/ArchiveArea.js

@@ -1,17 +1,5 @@
 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";
 const processPalettes = (archiveData) => {
     const allRegistered = new Set();
     for (const sector of archiveData.sectors) {
@@ -225,8 +213,7 @@ 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.light) palettes.light = sector.palettes.light;
     if (sector.palettes.secondaryState)
         palettes.secondaryState = sector.palettes.secondaryState;
     if (sector.palettes.state)
@@ -237,7 +224,7 @@ function SectorToArchivedAreaSector(sector) {
     sector.palettes.modMap = sector.palettes.modMap;
     return {
         position: [sector.location[1], sector.location[2], sector.location[3]],
-        sectorState: sector.sectorState,
+        sectorState: sector.flags,
         buffers: sector.buffers,
         palettes,
         sections: sector.sections,
@@ -254,7 +241,8 @@ export default function CreateArchiveArea(archiveData) {
         version: "",
         keys: {
             sectorState: sectorStateKeys,
-            sectionState: archiveData.sectors[0].keys.sectionState,
+            sectionState: []
+            //   sectionState: archiveData.sectors[0].keys.sectionState,
         },
         maps: {
             sectorState: buildSectorState(archiveData),
@@ -285,10 +273,11 @@ export function CreateSectorFromArea(area, sector) {
         id[i] = area.maps.id[i];
     }
     palettes.id = id;
-    palettes.light =
+    /*   palettes.light =
         typeof sector.palettes.light == "string"
-            ? area.maps.lightPalette[sector.palettes.light]
-            : sector.palettes.light;
+          ? area.maps.lightPalette[sector.palettes.light]
+          : sector.palettes.light;
+     */
     palettes.level =
         typeof sector.palettes.level == "string"
             ? area.maps.levelPalette[sector.palettes.level]
@@ -329,11 +318,14 @@ export function CreateSectorFromArea(area, sector) {
     }
     return {
         version: area.version,
+        vloxVersion: area.version,
         location: [area.dimension, ...sector.position],
-        sectorState,
-        keys: {
-            sectionState: area.keys.sectionState,
-        },
+        flags: sectorState,
+        timestamps: {},
+        /*     keys: {
+              sectionState: area.keys.sectionState,
+            }, */
+        duplicates: {},
         palettes,
         buffers: sector.buffers,
         sections,