From 7b74cbf7129646adc80d50304afce6240848cfae Mon Sep 17 00:00:00 2001
From: extremeheat <extreme@protonmail.ch>
Date: Wed, 27 Dec 2023 12:53:39 -0500
Subject: [PATCH] Fix zigzag type move in prismarine-nbt (#471)

* Fix rename of zigzag varint type in prismarine-nbt

* fix
---
 src/datatypes/minecraft.js   | 6 +++---
 src/transforms/serializer.js | 4 ++--
 tools/compileProtocol.js     | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/datatypes/minecraft.js b/src/datatypes/minecraft.js
index 5b93bc0..1a9186d 100644
--- a/src/datatypes/minecraft.js
+++ b/src/datatypes/minecraft.js
@@ -5,7 +5,7 @@ const UUID = require('uuid-1345')
 const protoLE = nbt.protos.little
 const protoLEV = nbt.protos.littleVarint
 // TODO: deal with this:
-const zigzag = require('prismarine-nbt/compiler-zigzag')
+const zigzag = require('prismarine-nbt/zigzag')
 
 function readUUID (buffer, offset) {
   if (offset + 16 > buffer.length) { throw new PartialReadError() }
@@ -160,6 +160,6 @@ module.exports = {
   entityMetadataLoop: [readEntityMetadata, writeEntityMetadata, sizeOfEntityMetadata],
   ipAddress: [readIpAddress, writeIpAddress, 4],
   endOfArray: [readEndOfArray, writeEndOfArray, sizeOfEndOfArray],
-  zigzag32: zigzag.zigzag32,
-  zigzag64: zigzag.zigzag64
+  zigzag32: zigzag.interpret.zigzag32,
+  zigzag64: zigzag.interpret.zigzag64
 }
diff --git a/src/transforms/serializer.js b/src/transforms/serializer.js
index e025654..91d4c97 100644
--- a/src/transforms/serializer.js
+++ b/src/transforms/serializer.js
@@ -37,7 +37,7 @@ function createProtocol (version) {
   const compiler = new ProtoDefCompiler()
   compiler.addTypesToCompile(protocol.types)
   compiler.addTypes(require('../datatypes/compiler-minecraft'))
-  compiler.addTypes(require('prismarine-nbt/compiler-zigzag'))
+  compiler.addTypes(require('prismarine-nbt/zigzag').compiler)
 
   const compiledProto = compiler.compileProtoDefSync()
   return compiledProto
@@ -47,7 +47,7 @@ function createProtocol (version) {
 function getProtocol (version) {
   const compiler = new ProtoDefCompiler()
   compiler.addTypes(require(join(__dirname, '../datatypes/compiler-minecraft')))
-  compiler.addTypes(require('prismarine-nbt/compiler-zigzag'))
+  compiler.addTypes(require('prismarine-nbt/zigzag').compiler)
 
   global.PartialReadError = require('protodef/src/utils').PartialReadError
   const compile = (compiler, file) => require(file)(compiler.native)
diff --git a/tools/compileProtocol.js b/tools/compileProtocol.js
index a51cfc1..dcf6545 100644
--- a/tools/compileProtocol.js
+++ b/tools/compileProtocol.js
@@ -15,7 +15,7 @@ function createProtocol (version) {
   const compiler = new ProtoDefCompiler()
   const protocol = mcData('bedrock_' + version).protocol.types
   compiler.addTypes(require('../src/datatypes/compiler-minecraft'))
-  compiler.addTypes(require('prismarine-nbt/compiler-zigzag'))
+  compiler.addTypes(require('prismarine-nbt/zigzag').compiler)
   compiler.addTypesToCompile(protocol)
 
   fs.writeFileSync('./read.js', 'module.exports = ' + compiler.readCompiler.generate().replace('() =>', 'native =>'))