11import type { NbtChunk } from 'deepslate'
2- import { getOptional , getTag , loadChunk , readNbt , readRegion , saveChunk , writeNbt , writeRegion } from 'deepslate'
2+ import { NbtFile , NbtRegion , NbtType } from 'deepslate'
33import * as vscode from 'vscode'
44import { applyEdit , reverseEdit } from './common/Operations'
5- import type { Logger , NbtEdit , NbtFile } from './common/types'
5+ import type { Logger , NbtEdit } from './common/types'
66import { Disposable } from './dispose'
77
88export class NbtDocument extends Disposable implements vscode . CustomDocument {
@@ -18,41 +18,31 @@ export class NbtDocument extends Disposable implements vscode.CustomDocument {
1818 return new NbtDocument ( uri , fileData , logger )
1919 }
2020
21- private static async readFile ( uri : vscode . Uri , logger : Logger ) : Promise < NbtFile > {
21+ private static async readFile ( uri : vscode . Uri , logger : Logger ) : Promise < NbtFile | NbtRegion > {
2222 const array = await vscode . workspace . fs . readFile ( uri )
2323
2424 logger . info ( `Read file [length=${ array . length } ${ uri . scheme } ${ uri . path . match ( / (?: \. ( [ ^ . ] + ) ) ? $ / ) ?. [ 1 ] } )
2525
2626 if ( uri . scheme === 'git' && array . length === 0 ) {
27- return {
28- region : false ,
29- name : '' ,
30- value : { } ,
31- }
27+ return NbtFile . create ( )
3228 }
3329
3430 if ( uri . fsPath . endsWith ( '.mca' ) ) {
35- return {
36- region : true ,
37- chunks : readRegion ( array ) ,
38- }
31+ return NbtRegion . read ( array )
3932 }
4033
4134 const littleEndian = uri . fsPath . endsWith ( '.mcstructure' )
42- const result = readNbt ( array , { littleEndian } )
35+ const file = NbtFile . read ( array , { littleEndian } )
4336
44- logger . info ( `Parsed NBT [compression=${ result . compression ?? 'none' } ${ result . littleEndian ?? false } ${ result . bedrockHeader ?? 'none' } )
37+ logger . info ( `Parsed NBT [compression=${ file . compression ?? 'none' } ${ file . littleEndian ?? false } ${ file . bedrockHeader ?? 'none' } )
4538
46- return {
47- region : false ,
48- ...result ,
49- }
39+ return file
5040 }
5141
5242
5343 private readonly _uri : vscode . Uri
5444
55- private _documentData : NbtFile
45+ private _documentData : NbtFile | NbtRegion
5646 private readonly _isStructure : boolean
5747 private readonly _isMap : boolean
5848 private readonly _isReadOnly : boolean
@@ -61,7 +51,7 @@ export class NbtDocument extends Disposable implements vscode.CustomDocument {
6151
6252 private constructor (
6353 uri : vscode . Uri ,
64- initialContent : NbtFile ,
54+ initialContent : NbtFile | NbtRegion ,
6555 private readonly logger : Logger ,
6656 ) {
6757 super ( )
@@ -85,13 +75,11 @@ export class NbtDocument extends Disposable implements vscode.CustomDocument {
8575
8676 public get dataVersion ( ) {
8777 const file = this . _documentData
88- if ( file . region ) {
89- const firstChunk = file . chunks . find ( c => c . data || c . nbt )
90- if ( ! firstChunk ) return undefined
91- loadChunk ( firstChunk )
92- return getOptional ( ( ) => getTag ( firstChunk . nbt ! . value , 'DataVersion' , 'int' ) , undefined )
78+ if ( file instanceof NbtRegion ) {
79+ const firstChunk = file . getFirstChunk ( )
80+ return firstChunk ?. getRoot ( ) . getNumber ( 'DataVersion' ) ?? 0
9381 } else {
94- return getOptional ( ( ) => getTag ( file . value , 'DataVersion' , 'int' ) , undefined )
82+ return file . root . getNumber ( 'DataVersion' ) ?? 0
9583 }
9684 }
9785
@@ -140,30 +128,26 @@ export class NbtDocument extends Disposable implements vscode.CustomDocument {
140128 }
141129
142130 private isStructureData ( ) {
143- if ( this . _documentData . region ) return false
144- const root = this . _documentData . value
145- return root [ 'size' ] ?. type === 'list'
146- && root [ 'size' ] . value . type === 'int'
147- && root [ 'size' ] . value . value . length === 3
148- && root [ 'blocks' ] ?. type === 'list'
149- && root [ 'palette' ] ?. type === 'list'
131+ if ( this . _documentData instanceof NbtRegion ) return false
132+ const root = this . _documentData . root
133+ return root . hasList ( 'size' , NbtType . Int , 3 )
134+ && root . hasList ( 'blocks' ) && root . hasList ( 'palette' )
150135 }
151136
152137 private isMapData ( ) {
153138 return this . _uri . fsPath . match ( / (?: \\ | \/ ) m a p _ \d + \. d a t $ / ) !== null
154139 }
155140
156141 async getChunkData ( x : number , z : number ) : Promise < NbtChunk > {
157- if ( ! this . _documentData . region ) {
142+ if ( ! ( this . _documentData instanceof NbtRegion ) ) {
158143 throw new Error ( 'File is not a region file' )
159144 }
160145
161- const chunks = this . _documentData . chunks
162- const chunk = chunks . find ( c => c . x === x && c . z === z )
146+ const chunk = this . _documentData . findChunk ( x , z )
163147 if ( ! chunk ) {
164148 throw new Error ( `Cannot find chunk [${ x } ${ z } )
165149 }
166- return loadChunk ( chunk )
150+ return chunk
167151 }
168152
169153 async save ( cancellation : vscode . CancellationToken ) : Promise < void > {
@@ -184,16 +168,7 @@ export class NbtDocument extends Disposable implements vscode.CustomDocument {
184168 return
185169 }
186170
187- if ( nbtFile . region ) {
188- nbtFile . chunks . filter ( c => c . dirty ) . forEach ( chunk => {
189- saveChunk ( chunk )
190- chunk . dirty = false
191- } )
192- }
193-
194- const fileData = nbtFile . region
195- ? writeRegion ( nbtFile . chunks )
196- : writeNbt ( nbtFile . value , nbtFile )
171+ const fileData = nbtFile . write ( )
197172
198173 await vscode . workspace . fs . writeFile ( targetResource , fileData )
199174 }
@@ -202,14 +177,7 @@ export class NbtDocument extends Disposable implements vscode.CustomDocument {
202177 const diskContent = await NbtDocument . readFile ( this . uri , this . logger )
203178 this . _documentData = diskContent
204179 this . _edits = this . _savedEdits
205- this . _onDidChangeDocument . fire ( {
206- ops : [ {
207- type : 'set' ,
208- path : [ ] ,
209- old : null ,
210- new : this . _documentData ,
211- } ] ,
212- } )
180+ // TODO: notify listeners that document has reset
213181 }
214182
215183 async backup ( destination : vscode . Uri , cancellation : vscode . CancellationToken ) : Promise < vscode . CustomDocumentBackup > {
0 commit comments