Pc1.20.2 #1265

extremeheat · 2023-12-18T21:24:52Z

~~The configuration state introduces lots of small problems in server/client expectations so there remain some errors in the test due to state desync. Will need to be investigated further~~

Needs audit of protocol.json for 1.20.2 against vanilla source code diff. Also, node-protodef-validator is not working.

After PrismarineJS/prismarine-nbt#81 and PrismarineJS/minecraft-data#810

extremeheat · 2023-12-18T21:26:54Z

src/createServer.js

@@ -45,6 +45,7 @@ function createServer (options = {}) {
  server.onlineModeExceptions = Object.create(null)
  server.favicon = favicon
  server.options = options
+  options.registryCodec = options.registryCodec || mcData.registryCodec || mcData.loginPacket?.dimensionCodec


The dimensionCodec is no longer in loginPacket. So it it needs to be dumped and put into mcdata seperately. It's required before clients are able to join (to exit configuration state)

rom1504 · 2023-12-19T13:23:47Z

src/datatypes/minecraft.js

@@ -43,35 +43,36 @@ function writeUUID (value, buffer, offset) {
  return offset + 16
 }

-function readNbt (buffer, offset) {
-  return nbt.proto.read(buffer, offset, 'nbt')
+function readNbt (buffer, offset, { tagType } = { tagType: 'nbt' }) {


Are we confident this is only useful for the network serialization?

Would there be any drawback to put this in prismarine-nbt ?

This is already just directly calling prismarine-nbt so it should be possible to just import the prismarine-nbt types directly into the protocol. But the optionalNBT type may actually require a custom type as there is a special case with zero.

Would require importing all the custom types also https://github.com/PrismarineJS/prismarine-nbt/blob/master/nbt.js#L11C1-L20C48

It seems to me that would be much cleaner as all nbt stuff would then live in prismarine-nbt

Also important if other stuff than nmp use the same format, for example anvil

extremeheat · 2023-12-26T05:26:27Z

src/server/login.js

+    client.state = states.PLAY
+    server.emit('playerJoin', client)


Ah, problem seems due to not waiting for client to send back a finish_config

extremeheat · 2023-12-26T05:43:04Z

ok, tests are now passing, but looks like there may be an issue with packet_chunk_batch_start

[05:40:13] [Server thread/INFO]: [Not Secure] <Player> hello everyone; I have logged in.
PartialReadError: Read error for undefined : undefined
    at new ExtendableError (/workspace/node-minecraft-protocol/node_modules/protodef/src/utils.js:63:13)
    at new PartialReadError (/workspace/node-minecraft-protocol/node_modules/protodef/src/utils.js:70:5)
    at Object.readVarInt [as varint] (/workspace/node-minecraft-protocol/node_modules/protodef/src/datatypes/utils.js:69:45)
    at Object.packet_chunk_batch_start (/workspace/node-minecraft-protocol/node_modules/protodef/src/g-ReadCompiler104533269d.js:956:67)
    at /workspace/node-minecraft-protocol/node_modules/protodef/src/g-ReadCompiler104533269d.js:3002:74
    at packet (/workspace/node-minecraft-protocol/node_modules/protodef/src/g-ReadCompiler104533269d.js:3104:9)
    at CompiledProtodef.read (/workspace/node-minecraft-protocol/node_modules/protodef/src/compiler.js:70:12)
    at e.message (/workspace/node-minecraft-protocol/node_modules/protodef/src/compiler.js:111:49)
    at tryCatch (/workspace/node-minecraft-protocol/node_modules/protodef/src/utils.js:50:16)
    at CompiledProtodef.parsePacketBuffer (/workspace/node-minecraft-protocol/node_modules/protodef/src/compiler.js:111:29)
    at FullPacketParser.parsePacketBuffer (/workspace/node-minecraft-protocol/node_modules/protodef/src/serializer.js:68:23)
    at FullPacketParser._transform (/workspace/node-minecraft-protocol/node_modules/protodef/src/serializer.js:74:21)
  ...
    at Socket.emit (node:events:514:28)
    ...
      ✔ does not crash for 10000ms (10489ms)

Currently chunk batch start looks like

        "packet_chunk_batch_start": [
          "container",
          [
            {
              "name": "batchSize",
              "type": "varint"
            }
          ]
        ],

But it seems chunk batch start in 1.20.2 has no fields https://github.com/extremeheat/extracted_minecraft_data/blob/client1.20.2/client/net/minecraft/network/protocol/game/ClientboundChunkBatchStartPacket.java

but finish retains the varint
https://github.com/extremeheat/extracted_minecraft_data/blob/client1.20.2/client/net/minecraft/network/protocol/game/ClientboundChunkBatchFinishedPacket.java

extremeheat · 2023-12-26T05:48:32Z

Actually, packet_chunk_batch_start is a new packet in 1.20.2, it's incorrect in mc-data. Would be a good idea to check the other types also against the source code, there are probably more unreviewed errors/missing things

wgaylord · 2023-12-26T07:37:18Z

Actually, packet_chunk_batch_start is a new packet in 1.20.2, it's incorrect in mc-data. Would be a good idea to check the other types also against the source code, there are probably more unreviewed errors/missing things

Looks like that may have been a dumb copy paste error on my part when doing all the packet changes in 1.20.2. As all my work was based on info from wiki.vg (Probably should have sanity checked it from source at some point)

extremeheat · 2023-12-27T01:58:21Z

Ok, tests are passing now. Validator issue is fixed, just need to check over the protocol.json now. But anyway I think this can be merged before that, would just need to be checking before working on mineflayer

rom1504 · 2023-12-27T02:56:02Z

src/datatypes/compiler-minecraft.js

@@ -16,8 +16,6 @@ module.exports = {
        size: buffer.length - offset
      }
    }],
-    nbt: ['native', minecraft.nbt[0]],
-    optionalNbt: ['native', minecraft.optionalNbt[0]],
    compressedNbt: ['native', minecraft.compressedNbt[0]],


maybe we could also move compressedNbt but not a big deal

rom1504 · 2023-12-27T02:58:54Z

src/server/login.js

+      client.once('login_acknowledged', onClientLoginAck)
+    } else {
+      client.state = states.PLAY
+      server.emit('playerJoin', client)


this new event should be documented.

It would be breaking for flying-squid (and other users), why do we change from 'login' ?

The server sets the mode to from LOGIN to CONFIG after receiving a login_ack from the client. The server emits login right after the ack, but the state is still in CONFIG so sending PLAY packets (like previous login event would let you do) would fail, so in 1.20.2+ now need to either listen for state event for it to turn to PLAY or use the added playerJoin event before sending game packets

Ok makes sense

rom1504 · 2023-12-27T03:02:49Z

looks good, I'm glad we could solve the nbt change with no hack and actually even improving the code, nice work @extremeheat

I think it would be good to fix PartialReadError: Read error for undefined : undefined before merging as this is definitely going to break usage of the lib for this version

@wgaylord do you want to check the packets you added against the source? that way you can learn to do it for 1.20.2 and then apply the same method for 1.20.3

wgaylord · 2023-12-27T06:10:27Z

Yeah, I am going to go thru all the packets I touched and double check them some time tomorrow.

rom1504 · 2023-12-27T23:34:28Z

No value for type soundSource , packedChunkedPos in packet tests

rom1504 · 2023-12-27T23:35:23Z

does seem to work fully except for this one, no error anymore for 1.20.2

rom1504 · 2023-12-27T23:48:04Z

I think it's good now, merging

rom1504 · 2023-12-27T23:48:21Z

/makerelease

extremeheat added 3 commits December 18, 2023 18:28

Initial changes for 1.20.2

a0c0619

add NBT serialize tag type handling

0b34806

update tests

b70ccdb

extremeheat commented Dec 18, 2023

View reviewed changes

rom1504 reviewed Dec 19, 2023

View reviewed changes

rom1504 and others added 4 commits December 25, 2023 20:33

Update pnbt and mcdata for nbt change

340084f

lint

5ae9db6

fix wrong param to sizeOfNbt

e994aed

fix dupe NBT types

a34b517

extremeheat mentioned this pull request Dec 26, 2023

1.20.2: use new anonOptionalNbt and anonymousNbt types from prismarine-nbt, add loginPacket PrismarineJS/minecraft-data#810

Merged

extremeheat added 4 commits December 26, 2023 04:03

move nbt logic to prismarine-nbt

247ef2b

update tests

92e653b

update tests

b7303bc

disable protodef validator in pluginChannel

3205332

extremeheat commented Dec 26, 2023

View reviewed changes

Fix state desync

c199b79

dump loginPacket.json in test output

bcff71f

enable validation

f302f90

extremeheat marked this pull request as ready for review December 27, 2023 02:00

rom1504 added 2 commits December 27, 2023 03:53

remove testing line in ci.yml

ac53af1

update pnbt to 2.5.0

2297c02

rom1504 reviewed Dec 27, 2023

View reviewed changes

extremeheat added 2 commits December 26, 2023 23:19

update doc for playerJoin

d8aacec

Update serializer.js

0c931a1

extremeheat added 2 commits December 27, 2023 01:53

update examples

ca9eb07

lint

92964c9

This was referenced Dec 27, 2023

Initial 1.20.2 support #1264

Closed

Update to 1.20.2 #1261

Closed

extremeheat and others added 4 commits December 27, 2023 14:41

disable client bundle handling if bundle becomes too big

2eb5ba5

Update client.js

9933b8d

Merge branch 'master' into pc1.20.2

e6eafb1

bump mcdata

db67632

add soundSource and packedChunkPos example test values

14ec152

rom1504 merged commit 112926d into PrismarineJS:master Dec 27, 2023
23 checks passed

rom1504bot mentioned this pull request Dec 27, 2023

Release 1.45.0 #1270

Merged

rom1504 mentioned this pull request Dec 27, 2023

Initial 1.20.2 support PrismarineJS/mineflayer#3243

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Pc1.20.2 #1265

Pc1.20.2 #1265

extremeheat commented Dec 18, 2023 •

edited

Loading

extremeheat Dec 18, 2023

rom1504 Dec 19, 2023

extremeheat Dec 19, 2023

extremeheat Dec 19, 2023

rom1504 Dec 25, 2023

extremeheat Dec 26, 2023

extremeheat commented Dec 26, 2023 •

edited

Loading

extremeheat commented Dec 26, 2023

wgaylord commented Dec 26, 2023 •

edited

Loading

extremeheat commented Dec 27, 2023

rom1504 Dec 27, 2023

rom1504 Dec 27, 2023

extremeheat Dec 27, 2023

rom1504 Dec 27, 2023

rom1504 commented Dec 27, 2023 •

edited

Loading

wgaylord commented Dec 27, 2023

rom1504 commented Dec 27, 2023

rom1504 commented Dec 27, 2023

rom1504 commented Dec 27, 2023

rom1504 commented Dec 27, 2023

Pc1.20.2 #1265

Pc1.20.2 #1265

Conversation

extremeheat commented Dec 18, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

extremeheat commented Dec 26, 2023 • edited Loading

extremeheat commented Dec 26, 2023

wgaylord commented Dec 26, 2023 • edited Loading

extremeheat commented Dec 27, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rom1504 commented Dec 27, 2023 • edited Loading

wgaylord commented Dec 27, 2023

rom1504 commented Dec 27, 2023

rom1504 commented Dec 27, 2023

rom1504 commented Dec 27, 2023

rom1504 commented Dec 27, 2023

extremeheat commented Dec 18, 2023 •

edited

Loading

extremeheat commented Dec 26, 2023 •

edited

Loading

wgaylord commented Dec 26, 2023 •

edited

Loading

rom1504 commented Dec 27, 2023 •

edited

Loading