anygatecloud/strom
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: resolve parameterized $compareTo types and fix array count type

Browse Source 
- VisitNameAndData: return any instead of named struct when mergeCompareTo
  resolves $compareTo, fixing field type mismatches for switch/container types
- ContainerCompareTo: traverse anon/bitfield fields for compareTo resolution,
  fixes entityMetadata 'field not found' errors
- Array.Count: change from string to any to handle numeric count values
- ArrayEncoder: fix nil check to correctly write length prefix for arrays
- ArrayDecoder: use fmt.Sprint for safe Count conversion
This commit is contained in:
OpenCode
2026-08-05 18:33:39 +02:00
parent fa70ea36c6
commit eb83786f9a
14 changed files with 2138 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mc/proto_generated/v1_16_5/proto.go
+686 -27
View File
@@ -1,6 +1,6 @@
// Code generated by strom. DO NOT EDIT.
// source: minecraft-data/pc/1.16.2/protocol.json (sha256:d96a3c5a7a7ddf2105e23990c2471b3aeafe4a6975e0c9d7d7943b599af9dfb3)
// version: (devel) (go1.26.2)
// version: v0.6.6-0.20260805154326-fa70ea36c6f5+dirty (go1.26.2)
package v1_16_5
import (
@@ -141,7 +141,7 @@ type EntityMetadata struct {
Key uint8
Type int32
}
Value EntityMetadataItem
Value any
}
}
@@ -151,7 +151,7 @@ func (ret *EntityMetadata) Decode(r io.ReadSeeker) (err error) {
Key uint8
Type int32
}
Value EntityMetadataItem
Value any
})
var id uint8
for {
@@ -171,7 +171,7 @@ func (ret *EntityMetadata) Decode(r io.ReadSeeker) (err error) {
Key uint8
Type int32
}
Value EntityMetadataItem
Value any
}
err = binary.Read(r, binary.BigEndian, &entry.Anon.Key)
if err != nil {
@@ -181,9 +181,191 @@ func (ret *EntityMetadata) Decode(r io.ReadSeeker) (err error) {
if err != nil {
return
}
err = entry.Value.Decode(r)
if err != nil {
return
switch entry.Anon.Type {
case 0:
var EntityMetadataInnerValue0Tmp int8
err = binary.Read(r, binary.BigEndian, &EntityMetadataInnerValue0Tmp)
if err != nil {
return
}
entry.Value = EntityMetadataInnerValue0Tmp
case 1:
var EntityMetadataInnerValue1Tmp int32
EntityMetadataInnerValue1Tmp, err = proto_base.DecodeVarInt(r)
if err != nil {
return
}
entry.Value = EntityMetadataInnerValue1Tmp
case 10:
var EntityMetadataInnerValue10Tmp *Position
var EntityMetadataInnerValue10TmpPresent bool
err = binary.Read(r, binary.BigEndian, &EntityMetadataInnerValue10TmpPresent)
if err != nil {
return
}
if EntityMetadataInnerValue10TmpPresent {
var EntityMetadataInnerValue10TmpPresentValue Position
err = EntityMetadataInnerValue10TmpPresentValue.Decode(r)
if err != nil {
return
}
EntityMetadataInnerValue10Tmp = &EntityMetadataInnerValue10TmpPresentValue
}
entry.Value = EntityMetadataInnerValue10Tmp
case 11:
var EntityMetadataInnerValue11Tmp int32
EntityMetadataInnerValue11Tmp, err = proto_base.DecodeVarInt(r)
if err != nil {
return
}
entry.Value = EntityMetadataInnerValue11Tmp
case 12:
var EntityMetadataInnerValue12Tmp *uuid.UUID
var EntityMetadataInnerValue12TmpPresent bool
err = binary.Read(r, binary.BigEndian, &EntityMetadataInnerValue12TmpPresent)
if err != nil {
return
}
if EntityMetadataInnerValue12TmpPresent {
var EntityMetadataInnerValue12TmpPresentValue uuid.UUID
_, err = io.ReadFull(r, EntityMetadataInnerValue12TmpPresentValue[:])
if err != nil {
return
}
EntityMetadataInnerValue12Tmp = &EntityMetadataInnerValue12TmpPresentValue
}
entry.Value = EntityMetadataInnerValue12Tmp
case 13:
var EntityMetadataInnerValue13Tmp int32
EntityMetadataInnerValue13Tmp, err = proto_base.DecodeVarInt(r)
if err != nil {
return
}
entry.Value = EntityMetadataInnerValue13Tmp
case 14:
var EntityMetadataInnerValue14Tmp nbt.Tag
err = EntityMetadataInnerValue14Tmp.Decode(r)
if err != nil {
return
}
entry.Value = EntityMetadataInnerValue14Tmp
case 15:
var EntityMetadataInnerValue15Tmp Particle
err = EntityMetadataInnerValue15Tmp.Decode(r)
if err != nil {
return
}
entry.Value = EntityMetadataInnerValue15Tmp
case 16:
var EntityMetadataInnerValue16Tmp struct {
VillagerType int32
VillagerProfession int32
Level int32
}
EntityMetadataInnerValue16Tmp.VillagerType, err = proto_base.DecodeVarInt(r)
if err != nil {
return
}
EntityMetadataInnerValue16Tmp.VillagerProfession, err = proto_base.DecodeVarInt(r)
if err != nil {
return
}
EntityMetadataInnerValue16Tmp.Level, err = proto_base.DecodeVarInt(r)
if err != nil {
return
}
entry.Value = EntityMetadataInnerValue16Tmp
case 17:
var EntityMetadataInnerValue17Tmp Optvarint
err = EntityMetadataInnerValue17Tmp.Decode(r)
if err != nil {
return
}
entry.Value = EntityMetadataInnerValue17Tmp
case 18:
var EntityMetadataInnerValue18Tmp int32
EntityMetadataInnerValue18Tmp, err = proto_base.DecodeVarInt(r)
if err != nil {
return
}
entry.Value = EntityMetadataInnerValue18Tmp
case 2:
var EntityMetadataInnerValue2Tmp float32
err = binary.Read(r, binary.BigEndian, &EntityMetadataInnerValue2Tmp)
if err != nil {
return
}
entry.Value = EntityMetadataInnerValue2Tmp
case 3:
var EntityMetadataInnerValue3Tmp string
EntityMetadataInnerValue3Tmp, err = proto_base.DecodeString(r)
if err != nil {
return
}
entry.Value = EntityMetadataInnerValue3Tmp
case 4:
var EntityMetadataInnerValue4Tmp string
EntityMetadataInnerValue4Tmp, err = proto_base.DecodeString(r)
if err != nil {
return
}
entry.Value = EntityMetadataInnerValue4Tmp
case 5:
var EntityMetadataInnerValue5Tmp *string
var EntityMetadataInnerValue5TmpPresent bool
err = binary.Read(r, binary.BigEndian, &EntityMetadataInnerValue5TmpPresent)
if err != nil {
return
}
if EntityMetadataInnerValue5TmpPresent {
var EntityMetadataInnerValue5TmpPresentValue string
EntityMetadataInnerValue5TmpPresentValue, err = proto_base.DecodeString(r)
if err != nil {
return
}
EntityMetadataInnerValue5Tmp = &EntityMetadataInnerValue5TmpPresentValue
}
entry.Value = EntityMetadataInnerValue5Tmp
case 6:
var EntityMetadataInnerValue6Tmp Slot
err = EntityMetadataInnerValue6Tmp.Decode(r)
if err != nil {
return
}
entry.Value = EntityMetadataInnerValue6Tmp
case 7:
var EntityMetadataInnerValue7Tmp bool
err = binary.Read(r, binary.BigEndian, &EntityMetadataInnerValue7Tmp)
if err != nil {
return
}
entry.Value = EntityMetadataInnerValue7Tmp
case 8:
var EntityMetadataInnerValue8Tmp struct {
Pitch float32
Yaw float32
Roll float32
}
err = binary.Read(r, binary.BigEndian, &EntityMetadataInnerValue8Tmp.Pitch)
if err != nil {
return
}
err = binary.Read(r, binary.BigEndian, &EntityMetadataInnerValue8Tmp.Yaw)
if err != nil {
return
}
err = binary.Read(r, binary.BigEndian, &EntityMetadataInnerValue8Tmp.Roll)
if err != nil {
return
}
entry.Value = EntityMetadataInnerValue8Tmp
case 9:
var EntityMetadataInnerValue9Tmp Position
err = EntityMetadataInnerValue9Tmp.Decode(r)
if err != nil {
return
}
entry.Value = EntityMetadataInnerValue9Tmp
}
ret.Val[id] = entry
}
@@ -199,10 +381,245 @@ func (ret *EntityMetadata) Encode(w io.Writer) (err error) {
if err != nil {
return
}
EntityMetadataValueEncTmp := v.Value
err = EntityMetadataValueEncTmp.Encode(w)
if err != nil {
return
switch v.Anon.Type {
case 0:
EntityMetadataValue, ok := v.Value.(int8)
if !ok {
err = proto_base.BadTypeError
return
}
err = binary.Write(w, binary.BigEndian, EntityMetadataValue)
if err != nil {
return
}
case 1:
EntityMetadataValue, ok := v.Value.(int32)
if !ok {
err = proto_base.BadTypeError
return
}
err = proto_base.EncodeVarInt(w, EntityMetadataValue)
if err != nil {
return
}
case 10:
EntityMetadataValue, ok := v.Value.(*Position)
if !ok {
err = proto_base.BadTypeError
return
}
err = binary.Write(w, binary.BigEndian, EntityMetadataValue != nil)
if err != nil {
return
}
if EntityMetadataValue != nil {
EntityMetadataValueEncTmp := *EntityMetadataValue
err = EntityMetadataValueEncTmp.Encode(w)
if err != nil {
return
}
}
case 11:
EntityMetadataValue, ok := v.Value.(int32)
if !ok {
err = proto_base.BadTypeError
return
}
err = proto_base.EncodeVarInt(w, EntityMetadataValue)
if err != nil {
return
}
case 12:
EntityMetadataValue, ok := v.Value.(*uuid.UUID)
if !ok {
err = proto_base.BadTypeError
return
}
err = binary.Write(w, binary.BigEndian, EntityMetadataValue != nil)
if err != nil {
return
}
if EntityMetadataValue != nil {
_, err = w.Write((*EntityMetadataValue)[:])
if err != nil {
return
}
}
case 13:
EntityMetadataValue, ok := v.Value.(int32)
if !ok {
err = proto_base.BadTypeError
return
}
err = proto_base.EncodeVarInt(w, EntityMetadataValue)
if err != nil {
return
}
case 14:
EntityMetadataValue, ok := v.Value.(nbt.Tag)
if !ok {
err = proto_base.BadTypeError
return
}
EntityMetadataValueEncTmp := EntityMetadataValue
err = EntityMetadataValueEncTmp.Encode(w)
if err != nil {
return
}
case 15:
EntityMetadataValue, ok := v.Value.(Particle)
if !ok {
err = proto_base.BadTypeError
return
}
EntityMetadataValueEncTmp := EntityMetadataValue
err = EntityMetadataValueEncTmp.Encode(w)
if err != nil {
return
}
case 16:
EntityMetadataValue, ok := v.Value.(struct {
VillagerType int32
VillagerProfession int32
Level int32
})
if !ok {
err = proto_base.BadTypeError
return
}
err = proto_base.EncodeVarInt(w, EntityMetadataValue.VillagerType)
if err != nil {
return
}
err = proto_base.EncodeVarInt(w, EntityMetadataValue.VillagerProfession)
if err != nil {
return
}
err = proto_base.EncodeVarInt(w, EntityMetadataValue.Level)
if err != nil {
return
}
case 17:
EntityMetadataValue, ok := v.Value.(Optvarint)
if !ok {
err = proto_base.BadTypeError
return
}
EntityMetadataValueEncTmp := EntityMetadataValue
err = EntityMetadataValueEncTmp.Encode(w)
if err != nil {
return
}
case 18:
EntityMetadataValue, ok := v.Value.(int32)
if !ok {
err = proto_base.BadTypeError
return
}
err = proto_base.EncodeVarInt(w, EntityMetadataValue)
if err != nil {
return
}
case 2:
EntityMetadataValue, ok := v.Value.(float32)
if !ok {
err = proto_base.BadTypeError
return
}
err = binary.Write(w, binary.BigEndian, EntityMetadataValue)
if err != nil {
return
}
case 3:
EntityMetadataValue, ok := v.Value.(string)
if !ok {
err = proto_base.BadTypeError
return
}
err = proto_base.EncodeString(w, EntityMetadataValue)
if err != nil {
return
}
case 4:
EntityMetadataValue, ok := v.Value.(string)
if !ok {
err = proto_base.BadTypeError
return
}
err = proto_base.EncodeString(w, EntityMetadataValue)
if err != nil {
return
}
case 5:
EntityMetadataValue, ok := v.Value.(*string)
if !ok {
err = proto_base.BadTypeError
return
}
err = binary.Write(w, binary.BigEndian, EntityMetadataValue != nil)
if err != nil {
return
}
if EntityMetadataValue != nil {
err = proto_base.EncodeString(w, *EntityMetadataValue)
if err != nil {
return
}
}
case 6:
EntityMetadataValue, ok := v.Value.(Slot)
if !ok {
err = proto_base.BadTypeError
return
}
EntityMetadataValueEncTmp := EntityMetadataValue
err = EntityMetadataValueEncTmp.Encode(w)
if err != nil {
return
}
case 7:
EntityMetadataValue, ok := v.Value.(bool)
if !ok {
err = proto_base.BadTypeError
return
}
err = binary.Write(w, binary.BigEndian, EntityMetadataValue)
if err != nil {
return
}
case 8:
EntityMetadataValue, ok := v.Value.(struct {
Pitch float32
Yaw float32
Roll float32
})
if !ok {
err = proto_base.BadTypeError
return
}
err = binary.Write(w, binary.BigEndian, EntityMetadataValue.Pitch)
if err != nil {
return
}
err = binary.Write(w, binary.BigEndian, EntityMetadataValue.Yaw)
if err != nil {
return
}
err = binary.Write(w, binary.BigEndian, EntityMetadataValue.Roll)
if err != nil {
return
}
case 9:
EntityMetadataValue, ok := v.Value.(Position)
if !ok {
err = proto_base.BadTypeError
return
}
EntityMetadataValueEncTmp := EntityMetadataValue
err = EntityMetadataValueEncTmp.Encode(w)
if err != nil {
return
}
}
}
err = binary.Write(w, binary.BigEndian, uint8(255))
@@ -339,7 +756,7 @@ func (ret *Optvarint) Encode(w io.Writer) (err error) {
type Particle struct {
ParticleId int32
Data ParticleData
Data any
}
func (ret *Particle) Decode(r io.ReadSeeker) (err error) {
@@ -347,9 +764,62 @@ func (ret *Particle) Decode(r io.ReadSeeker) (err error) {
if err != nil {
return
}
err = ret.Data.Decode(r)
if err != nil {
return
switch ret.ParticleId {
case 14:
var ParticleData14Tmp struct {
Red float32
Green float32
Blue float32
Scale float32
}
err = binary.Read(r, binary.BigEndian, &ParticleData14Tmp.Red)
if err != nil {
return
}
err = binary.Read(r, binary.BigEndian, &ParticleData14Tmp.Green)
if err != nil {
return
}
err = binary.Read(r, binary.BigEndian, &ParticleData14Tmp.Blue)
if err != nil {
return
}
err = binary.Read(r, binary.BigEndian, &ParticleData14Tmp.Scale)
if err != nil {
return
}
ret.Data = ParticleData14Tmp
case 23:
var ParticleData23Tmp struct {
BlockState int32
}
ParticleData23Tmp.BlockState, err = proto_base.DecodeVarInt(r)
if err != nil {
return
}
ret.Data = ParticleData23Tmp
case 3:
var ParticleData3Tmp struct {
BlockState int32
}
ParticleData3Tmp.BlockState, err = proto_base.DecodeVarInt(r)
if err != nil {
return
}
ret.Data = ParticleData3Tmp
case 34:
var ParticleData34Tmp struct {
Item Slot
}
err = ParticleData34Tmp.Item.Decode(r)
if err != nil {
return
}
ret.Data = ParticleData34Tmp
default:
var ParticleDataTmp struct {
}
ret.Data = ParticleDataTmp
}
return
}
@@ -358,10 +828,78 @@ func (ret *Particle) Encode(w io.Writer) (err error) {
if err != nil {
return
}
ParticleDataEncTmp := ret.Data
err = ParticleDataEncTmp.Encode(w)
if err != nil {
return
switch ret.ParticleId {
case 14:
ParticleData, ok := ret.Data.(struct {
Red float32
Green float32
Blue float32
Scale float32
})
if !ok {
err = proto_base.BadTypeError
return
}
err = binary.Write(w, binary.BigEndian, ParticleData.Red)
if err != nil {
return
}
err = binary.Write(w, binary.BigEndian, ParticleData.Green)
if err != nil {
return
}
err = binary.Write(w, binary.BigEndian, ParticleData.Blue)
if err != nil {
return
}
err = binary.Write(w, binary.BigEndian, ParticleData.Scale)
if err != nil {
return
}
case 23:
ParticleData, ok := ret.Data.(struct {
BlockState int32
})
if !ok {
err = proto_base.BadTypeError
return
}
err = proto_base.EncodeVarInt(w, ParticleData.BlockState)
if err != nil {
return
}
case 3:
ParticleData, ok := ret.Data.(struct {
BlockState int32
})
if !ok {
err = proto_base.BadTypeError
return
}
err = proto_base.EncodeVarInt(w, ParticleData.BlockState)
if err != nil {
return
}
case 34:
ParticleData, ok := ret.Data.(struct {
Item Slot
})
if !ok {
err = proto_base.BadTypeError
return
}
ParticleDataItemEncTmp := ParticleData.Item
err = ParticleDataItemEncTmp.Encode(w)
if err != nil {
return
}
default:
_, ok := ret.Data.(struct {
})
if !ok {
err = proto_base.BadTypeError
return
}
}
return
}
@@ -10484,7 +11022,7 @@ type PlayToClientPacketWorldParticles struct {
OffsetZ float32
ParticleData float32
Particles int32
Data ParticleData
Data any
}
func (ret *PlayToClientPacketWorldParticles) Decode(r io.ReadSeeker) (err error) {
@@ -10528,9 +11066,62 @@ func (ret *PlayToClientPacketWorldParticles) Decode(r io.ReadSeeker) (err error)
if err != nil {
return
}
err = ret.Data.Decode(r)
if err != nil {
return
switch ret.ParticleId {
case 14:
var PlayToClientPacketWorldParticlesData14Tmp struct {
Red float32
Green float32
Blue float32
Scale float32
}
err = binary.Read(r, binary.BigEndian, &PlayToClientPacketWorldParticlesData14Tmp.Red)
if err != nil {
return
}
err = binary.Read(r, binary.BigEndian, &PlayToClientPacketWorldParticlesData14Tmp.Green)
if err != nil {
return
}
err = binary.Read(r, binary.BigEndian, &PlayToClientPacketWorldParticlesData14Tmp.Blue)
if err != nil {
return
}
err = binary.Read(r, binary.BigEndian, &PlayToClientPacketWorldParticlesData14Tmp.Scale)
if err != nil {
return
}
ret.Data = PlayToClientPacketWorldParticlesData14Tmp
case 23:
var PlayToClientPacketWorldParticlesData23Tmp struct {
BlockState int32
}
PlayToClientPacketWorldParticlesData23Tmp.BlockState, err = proto_base.DecodeVarInt(r)
if err != nil {
return
}
ret.Data = PlayToClientPacketWorldParticlesData23Tmp
case 3:
var PlayToClientPacketWorldParticlesData3Tmp struct {
BlockState int32
}
PlayToClientPacketWorldParticlesData3Tmp.BlockState, err = proto_base.DecodeVarInt(r)
if err != nil {
return
}
ret.Data = PlayToClientPacketWorldParticlesData3Tmp
case 34:
var PlayToClientPacketWorldParticlesData34Tmp struct {
Item Slot
}
err = PlayToClientPacketWorldParticlesData34Tmp.Item.Decode(r)
if err != nil {
return
}
ret.Data = PlayToClientPacketWorldParticlesData34Tmp
default:
var PlayToClientPacketWorldParticlesDataTmp struct {
}
ret.Data = PlayToClientPacketWorldParticlesDataTmp
}
return
}
@@ -10575,10 +11166,78 @@ func (ret *PlayToClientPacketWorldParticles) Encode(w io.Writer) (err error) {
if err != nil {
return
}
PlayToClientPacketWorldParticlesDataEncTmp := ret.Data
err = PlayToClientPacketWorldParticlesDataEncTmp.Encode(w)
if err != nil {
return
switch ret.ParticleId {
case 14:
PlayToClientPacketWorldParticlesData, ok := ret.Data.(struct {
Red float32
Green float32
Blue float32
Scale float32
})
if !ok {
err = proto_base.BadTypeError
return
}
err = binary.Write(w, binary.BigEndian, PlayToClientPacketWorldParticlesData.Red)
if err != nil {
return
}
err = binary.Write(w, binary.BigEndian, PlayToClientPacketWorldParticlesData.Green)
if err != nil {
return
}
err = binary.Write(w, binary.BigEndian, PlayToClientPacketWorldParticlesData.Blue)
if err != nil {
return
}
err = binary.Write(w, binary.BigEndian, PlayToClientPacketWorldParticlesData.Scale)
if err != nil {
return
}
case 23:
PlayToClientPacketWorldParticlesData, ok := ret.Data.(struct {
BlockState int32
})
if !ok {
err = proto_base.BadTypeError
return
}
err = proto_base.EncodeVarInt(w, PlayToClientPacketWorldParticlesData.BlockState)
if err != nil {
return
}
case 3:
PlayToClientPacketWorldParticlesData, ok := ret.Data.(struct {
BlockState int32
})
if !ok {
err = proto_base.BadTypeError
return
}
err = proto_base.EncodeVarInt(w, PlayToClientPacketWorldParticlesData.BlockState)
if err != nil {
return
}
case 34:
PlayToClientPacketWorldParticlesData, ok := ret.Data.(struct {
Item Slot
})
if !ok {
err = proto_base.BadTypeError
return
}
PlayToClientPacketWorldParticlesDataItemEncTmp := PlayToClientPacketWorldParticlesData.Item
err = PlayToClientPacketWorldParticlesDataItemEncTmp.Encode(w)
if err != nil {
return
}
default:
_, ok := ret.Data.(struct {
})
if !ok {
err = proto_base.BadTypeError
return
}
}
return
}