Compare commits
10
Commits
7c978e1a7e
...
ac12f5c93b
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ac12f5c93b | ||
|
|
e58499ed09 | ||
|
|
f4c2762881 | ||
|
|
53d366ae53 | ||
|
|
56ac8e154e | ||
|
|
ac1b298989 | ||
|
|
1d8f70c7fd | ||
|
|
40b584dec4 | ||
|
|
eb83786f9a | ||
|
|
fa70ea36c6 |
+2
-1
@@ -1,4 +1,5 @@
|
||||
.devres/
|
||||
.idea/
|
||||
.failed_packets/
|
||||
.vscode/
|
||||
.vscode/proto_generator
|
||||
proto_generator
|
||||
|
||||
@@ -4,15 +4,15 @@ import (
|
||||
"bytes"
|
||||
"testing"
|
||||
|
||||
generated "github.com/admin-else/strom/mc/proto_generated/%v"
|
||||
generated "github.com/admin-else/strom/mc/proto_generated/%v"
|
||||
)
|
||||
|
||||
// Error: %v
|
||||
func TestFailedPacket%10X(t *testing.T) {
|
||||
p := &generated.%v{}
|
||||
b := bytes.NewBuffer(%#v)
|
||||
p := &generated.%v{}
|
||||
b := bytes.NewReader(%#v)
|
||||
err := p.Decode(b)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
if err == nil {
|
||||
t.Fatalf("expected decode error but got nil")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,7 +15,6 @@ import (
|
||||
"reflect"
|
||||
"strings"
|
||||
|
||||
"github.com/admin-else/strom/mc/data"
|
||||
"github.com/admin-else/strom/mc/proto"
|
||||
"github.com/admin-else/strom/mc/proto_base"
|
||||
)
|
||||
@@ -46,11 +45,8 @@ func SaveUnCodeAbleAsTest(packet *proto.UnCodablePacket) (err error) {
|
||||
return
|
||||
}
|
||||
|
||||
ret, err := data.LookUpVersionByProtocolVersion(packet.Info.ProtocolVersion)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
goPackage := "v" + strings.ReplaceAll(ret.MinecraftVersion, ".", "_")
|
||||
typeStr := reflect.TypeOf(packet.Info.Type).String()
|
||||
goPackage := typeStr[1:strings.LastIndex(typeStr, ".")]
|
||||
typeName := reflect.TypeOf(packet.Info.Type).Elem().Name()
|
||||
|
||||
src := fmt.Sprintf(TestSrcF, goPackage, packet.Err, h, typeName, packet.Data)
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -0,0 +1,18 @@
|
||||
package failed_packets_test
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"testing"
|
||||
|
||||
generated "github.com/admin-else/strom/mc/proto_generated/v26_2"
|
||||
)
|
||||
|
||||
// Error: unexpected EOF
|
||||
func TestFailedPacket0F8B37C94207F7BF(t *testing.T) {
|
||||
p := &generated.PlayToClientPacketUpdateTime{}
|
||||
b := bytes.NewReader([]byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1c, 0x42, 0x0})
|
||||
err := p.Decode(b)
|
||||
if err == nil {
|
||||
t.Fatalf("expected decode error but got nil")
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
package failed_packets_test
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"testing"
|
||||
|
||||
generated "github.com/admin-else/strom/mc/proto_generated/v26_2"
|
||||
)
|
||||
|
||||
// Error: unexpected EOF
|
||||
func TestFailedPacket6C9AD835672C5C51(t *testing.T) {
|
||||
p := &generated.PlayToClientPacketUpdateTime{}
|
||||
b := bytes.NewReader([]byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1b, 0xde, 0x0})
|
||||
err := p.Decode(b)
|
||||
if err == nil {
|
||||
t.Fatalf("expected decode error but got nil")
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
package failed_packets_test
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"testing"
|
||||
|
||||
generated "github.com/admin-else/strom/mc/proto_generated/v26_2"
|
||||
)
|
||||
|
||||
// Error: unexpected EOF
|
||||
func TestFailedPacketA5D61E1C0F23E7FA(t *testing.T) {
|
||||
p := &generated.PlayToClientPacketUpdateTime{}
|
||||
b := bytes.NewReader([]byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1c, 0x56, 0x0})
|
||||
err := p.Decode(b)
|
||||
if err == nil {
|
||||
t.Fatalf("expected decode error but got nil")
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
package failed_packets_test
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"testing"
|
||||
|
||||
generated "github.com/admin-else/strom/mc/proto_generated/v26_2"
|
||||
)
|
||||
|
||||
// Error: unexpected EOF
|
||||
func TestFailedPacketCAA58159889F7E8A(t *testing.T) {
|
||||
p := &generated.PlayToClientPacketUpdateTime{}
|
||||
b := bytes.NewReader([]byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1c, 0x2e, 0x0})
|
||||
err := p.Decode(b)
|
||||
if err == nil {
|
||||
t.Fatalf("expected decode error but got nil")
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
package failed_packets_test
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"testing"
|
||||
|
||||
generated "github.com/admin-else/strom/mc/proto_generated/v26_2"
|
||||
)
|
||||
|
||||
// Error: unexpected EOF
|
||||
func TestFailedPacketD18FC4C0B2DF2972(t *testing.T) {
|
||||
p := &generated.PlayToClientPacketUpdateTime{}
|
||||
b := bytes.NewReader([]byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1b, 0xf2, 0x0})
|
||||
err := p.Decode(b)
|
||||
if err == nil {
|
||||
t.Fatalf("expected decode error but got nil")
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
package failed_packets_test
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"testing"
|
||||
|
||||
generated "github.com/admin-else/strom/mc/proto_generated/v26_2"
|
||||
)
|
||||
|
||||
// Error: unexpected EOF
|
||||
func TestFailedPacketE81E82016DB04F28(t *testing.T) {
|
||||
p := &generated.PlayToClientPacketUpdateTime{}
|
||||
b := bytes.NewReader([]byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1c, 0x6, 0x0})
|
||||
err := p.Decode(b)
|
||||
if err == nil {
|
||||
t.Fatalf("expected decode error but got nil")
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
package failed_packets_test
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"testing"
|
||||
|
||||
generated "github.com/admin-else/strom/mc/proto_generated/v26_2"
|
||||
)
|
||||
|
||||
// Error: unexpected EOF
|
||||
func TestFailedPacketFE935CF2E584C649(t *testing.T) {
|
||||
p := &generated.PlayToClientPacketUpdateTime{}
|
||||
b := bytes.NewReader([]byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1c, 0x1a, 0x0})
|
||||
err := p.Decode(b)
|
||||
if err == nil {
|
||||
t.Fatalf("expected decode error but got nil")
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
package failed_packets_test
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"testing"
|
||||
|
||||
generated "github.com/admin-else/strom/mc/proto_generated/v26_2"
|
||||
)
|
||||
|
||||
// Decode regression: recipe_book_add (26.2) - SlotDisplay type fix
|
||||
func TestRegressionPacket25D845B5D0023D22(t *testing.T) {
|
||||
p := &generated.PlayToClientPacketRecipeBookAdd{}
|
||||
b := bytes.NewReader([]byte{0x1, 0xbe, 0x2, 0x1, 0x2, 0x2, 0x4, 0x6, 0x10, 0x6d, 0x69, 0x6e, 0x65, 0x63, 0x72, 0x61, 0x66, 0x74, 0x3a, 0x70, 0x6c, 0x61, 0x6e, 0x6b, 0x73, 0x6, 0x10, 0x6d, 0x69, 0x6e, 0x65, 0x63, 0x72, 0x61, 0x66, 0x74, 0x3a, 0x70, 0x6c, 0x61, 0x6e, 0x6b, 0x73, 0x6, 0x10, 0x6d, 0x69, 0x6e, 0x65, 0x63, 0x72, 0x61, 0x66, 0x74, 0x3a, 0x70, 0x6c, 0x61, 0x6e, 0x6b, 0x73, 0x6, 0x10, 0x6d, 0x69, 0x6e, 0x65, 0x63, 0x72, 0x61, 0x66, 0x74, 0x3a, 0x70, 0x6c, 0x61, 0x6e, 0x6b, 0x73, 0x5, 0xe8, 0x2, 0x1, 0x0, 0x0, 0x4, 0xe8, 0x2, 0x0, 0x3, 0x1, 0x4, 0x0, 0x10, 0x6d, 0x69, 0x6e, 0x65, 0x63, 0x72, 0x61, 0x66, 0x74, 0x3a, 0x70, 0x6c, 0x61, 0x6e, 0x6b, 0x73, 0x0, 0x10, 0x6d, 0x69, 0x6e, 0x65, 0x63, 0x72, 0x61, 0x66, 0x74, 0x3a, 0x70, 0x6c, 0x61, 0x6e, 0x6b, 0x73, 0x0, 0x10, 0x6d, 0x69, 0x6e, 0x65, 0x63, 0x72, 0x61, 0x66, 0x74, 0x3a, 0x70, 0x6c, 0x61, 0x6e, 0x6b, 0x73, 0x0, 0x10, 0x6d, 0x69, 0x6e, 0x65, 0x63, 0x72, 0x61, 0x66, 0x74, 0x3a, 0x70, 0x6c, 0x61, 0x6e, 0x6b, 0x73, 0x2, 0x1})
|
||||
err := p.Decode(b)
|
||||
if err != nil {
|
||||
t.Fatalf("regression: decode failed: %v", err)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
package failed_packets_test
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"testing"
|
||||
generated "github.com/admin-else/strom/mc/proto_generated/v26_2"
|
||||
)
|
||||
|
||||
// Decode regression: declare_commands (26.2) - bitfield + extraNodeData fix
|
||||
func TestRegressionPacket78C731784E6E834A(t *testing.T) {
|
||||
p := &generated.PlayToClientPacketDeclareCommands{}
|
||||
b := bytes.NewReader([]byte{0x1a, 0x0, 0xa, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0x1, 0x1, 0xb, 0x2, 0x6d, 0x65, 0x5, 0x1, 0xc, 0x4, 0x68, 0x65, 0x6c, 0x70, 0x5, 0x1, 0xd, 0x4, 0x6c, 0x69, 0x73, 0x74, 0x1, 0x1, 0xe, 0x3, 0x6d, 0x73, 0x67, 0x9, 0x0, 0x4, 0x4, 0x74, 0x65, 0x6c, 0x6c, 0x9, 0x0, 0x4, 0x1, 0x77, 0x1, 0x2, 0xf, 0x10, 0x6, 0x72, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x1, 0x1, 0x11, 0x7, 0x74, 0x65, 0x61, 0x6d, 0x6d, 0x73, 0x67, 0x9, 0x0, 0x8, 0x2, 0x74, 0x6d, 0x1, 0x1, 0x12, 0x7, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x6, 0x0, 0x6, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x14, 0x6, 0x0, 0x7, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x5, 0x2, 0x5, 0x0, 0x5, 0x75, 0x75, 0x69, 0x64, 0x73, 0x2, 0x1, 0x13, 0x7, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x73, 0x6, 0x2, 0x1, 0x1, 0x14, 0x5, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x1, 0x1, 0x15, 0x4, 0x72, 0x6f, 0x6c, 0x6c, 0x6, 0x0, 0x7, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x14, 0x16, 0x2, 0x16, 0x17, 0x9, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x18, 0x14, 0x6d, 0x69, 0x6e, 0x65, 0x63, 0x72, 0x61, 0x66, 0x74, 0x3a, 0x61, 0x73, 0x6b, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x6, 0x0, 0x7, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x14, 0x6, 0x0, 0x5, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x27, 0x6, 0x0, 0x5, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x27, 0x1, 0x1, 0x18, 0x3, 0x61, 0x64, 0x64, 0x1, 0x1, 0x19, 0x3, 0x73, 0x65, 0x74, 0x6, 0x0, 0x5, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3, 0x0, 0x6, 0x0, 0x5, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3, 0x0, 0x0})
|
||||
err := p.Decode(b)
|
||||
if err != nil {
|
||||
t.Fatalf("regression: decode failed: %v", err)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
package failed_packets_test
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"testing"
|
||||
|
||||
generated "github.com/admin-else/strom/mc/proto_generated/v1_8"
|
||||
)
|
||||
|
||||
// Decode regression: spawn_entity_living (1.8) - entityMetadata mergeCompareTo
|
||||
func TestRegressionPacket2B76AF8B937B1E8F(t *testing.T) {
|
||||
p := &generated.PlayToClientPacketSpawnEntityLiving{}
|
||||
b := bytes.NewReader([]byte{0x4c, 0x65, 0xff, 0xff, 0xed, 0x66, 0x0, 0x0, 0x7, 0xe0, 0x0, 0x0, 0x29, 0xe6, 0x91, 0x0, 0x91, 0x0, 0x0, 0xfd, 0x8d, 0x0, 0x0, 0x0, 0x0, 0x21, 0x1, 0x2c, 0x82, 0x0, 0x12, 0x4, 0x3, 0x0, 0x4, 0x0, 0x66, 0x41, 0x20, 0x0, 0x0, 0x47, 0x0, 0x0, 0x0, 0x0, 0x8, 0x0, 0x9, 0x0, 0xc, 0x0, 0xf, 0x0, 0x7f})
|
||||
err := p.Decode(b)
|
||||
if err != nil {
|
||||
t.Fatalf("regression: decode failed: %v", err)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
package failed_packets_test
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"testing"
|
||||
|
||||
generated "github.com/admin-else/strom/mc/proto_generated/v1_8"
|
||||
)
|
||||
|
||||
// Decode regression: entity_equipment (1.8) - nbt TAG_End fix
|
||||
func TestRegressionPacket0C20C77EA68496BD(t *testing.T) {
|
||||
p := &generated.PlayToClientPacketEntityEquipment{}
|
||||
b := bytes.NewReader([]byte{0x89, 0x16, 0x0, 0x0, 0x1, 0x5, 0x1, 0x0, 0x0, 0x0})
|
||||
err := p.Decode(b)
|
||||
if err != nil {
|
||||
t.Fatalf("regression: decode failed: %v", err)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
package failed_packets_test
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"testing"
|
||||
|
||||
generated "github.com/admin-else/strom/mc/proto_generated/v1_8"
|
||||
)
|
||||
|
||||
// Decode regression: entity_metadata (1.8) - entityMetadataLoop mergeCompareTo
|
||||
func TestRegressionPacketDF2DF88561529208(t *testing.T) {
|
||||
p := &generated.PlayToClientPacketEntityMetadata{}
|
||||
b := bytes.NewReader([]byte{0x69, 0x0, 0x0, 0x21, 0x1, 0x2c, 0x82, 0x0, 0x3, 0x0, 0x4, 0x0, 0x66, 0x40, 0x80, 0x0, 0x0, 0x47, 0x0, 0x0, 0x0, 0x0, 0x8, 0x0, 0x9, 0x0, 0xc, 0x0, 0xf, 0x0, 0x7f})
|
||||
err := p.Decode(b)
|
||||
if err != nil {
|
||||
t.Fatalf("regression: decode failed: %v", err)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
package failed_packets_test
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"testing"
|
||||
|
||||
generated "github.com/admin-else/strom/mc/proto_generated/v26_2"
|
||||
)
|
||||
|
||||
// Decode regression: entity_equipment (26.2) - topBitSetTerminatedArray
|
||||
func TestRegressionPacket1D0089BBE86A1648(t *testing.T) {
|
||||
p := &generated.PlayToClientPacketEntityEquipment{}
|
||||
b := bytes.NewReader([]byte{0x81, 0x2, 0x0, 0x1, 0x9a, 0x7, 0x0, 0x0})
|
||||
err := p.Decode(b)
|
||||
if err != nil {
|
||||
t.Fatalf("regression: decode failed: %v", err)
|
||||
}
|
||||
}
|
||||
@@ -4120,11 +4120,6 @@
|
||||
"type": [
|
||||
"bitfield",
|
||||
[
|
||||
{
|
||||
"name": "unused",
|
||||
"size": 2,
|
||||
"signed": false
|
||||
},
|
||||
{
|
||||
"name": "allows_restricted",
|
||||
"size": 1,
|
||||
@@ -11697,4 +11692,4 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2803,11 +2803,6 @@
|
||||
"type": [
|
||||
"bitfield",
|
||||
[
|
||||
{
|
||||
"name": "unused",
|
||||
"size": 2,
|
||||
"signed": false
|
||||
},
|
||||
{
|
||||
"name": "allows_restricted",
|
||||
"size": 1,
|
||||
@@ -10259,4 +10254,4 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3822,11 +3822,6 @@
|
||||
"type": [
|
||||
"bitfield",
|
||||
[
|
||||
{
|
||||
"name": "unused",
|
||||
"size": 2,
|
||||
"signed": false
|
||||
},
|
||||
{
|
||||
"name": "allows_restricted",
|
||||
"size": 1,
|
||||
@@ -11399,4 +11394,4 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4112,11 +4112,6 @@
|
||||
"type": [
|
||||
"bitfield",
|
||||
[
|
||||
{
|
||||
"name": "unused",
|
||||
"size": 2,
|
||||
"signed": false
|
||||
},
|
||||
{
|
||||
"name": "allows_restricted",
|
||||
"size": 1,
|
||||
|
||||
@@ -4112,11 +4112,6 @@
|
||||
"type": [
|
||||
"bitfield",
|
||||
[
|
||||
{
|
||||
"name": "unused",
|
||||
"size": 2,
|
||||
"signed": false
|
||||
},
|
||||
{
|
||||
"name": "allows_restricted",
|
||||
"size": 1,
|
||||
@@ -5726,12 +5721,15 @@
|
||||
"mappings": {
|
||||
"0": "empty",
|
||||
"1": "any_fuel",
|
||||
"2": "item",
|
||||
"3": "item_stack",
|
||||
"4": "tag",
|
||||
"5": "smithing_trim",
|
||||
"6": "with_remainder",
|
||||
"7": "composite"
|
||||
"2": "with_any_potion",
|
||||
"3": "only_with_component",
|
||||
"4": "item",
|
||||
"5": "item_stack",
|
||||
"6": "tag",
|
||||
"7": "dyed",
|
||||
"8": "smithing_trim",
|
||||
"9": "with_remainder",
|
||||
"10": "composite"
|
||||
}
|
||||
}
|
||||
]
|
||||
@@ -5745,9 +5743,44 @@
|
||||
"fields": {
|
||||
"empty": "void",
|
||||
"any_fuel": "void",
|
||||
"with_any_potion": [
|
||||
"container",
|
||||
[
|
||||
{
|
||||
"name": "display",
|
||||
"type": "SlotDisplay"
|
||||
}
|
||||
]
|
||||
],
|
||||
"only_with_component": [
|
||||
"container",
|
||||
[
|
||||
{
|
||||
"name": "source",
|
||||
"type": "SlotDisplay"
|
||||
},
|
||||
{
|
||||
"name": "component",
|
||||
"type": "IDSet"
|
||||
}
|
||||
]
|
||||
],
|
||||
"item": "varint",
|
||||
"item_stack": "Slot",
|
||||
"tag": "string",
|
||||
"dyed": [
|
||||
"container",
|
||||
[
|
||||
{
|
||||
"name": "dye",
|
||||
"type": "SlotDisplay"
|
||||
},
|
||||
{
|
||||
"name": "target",
|
||||
"type": "SlotDisplay"
|
||||
}
|
||||
]
|
||||
],
|
||||
"smithing_trim": [
|
||||
"container",
|
||||
[
|
||||
@@ -11779,4 +11812,4 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -68,6 +68,9 @@ func (s *Tag) Decode(r io.Reader) (err error) {
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
if id == End {
|
||||
return
|
||||
}
|
||||
var name any
|
||||
name, err = readPayload(String, r)
|
||||
if err != nil {
|
||||
|
||||
@@ -262,6 +262,12 @@ func ErroringIndex[K comparable, V any, M map[K]V](m M, i K) (v V, err error) {
|
||||
return
|
||||
}
|
||||
|
||||
// NonErroringIndex looks up key k in map m and returns the zero value without error if not found.
|
||||
func NonErroringIndex[K comparable, V any, M map[K]V](m M, i K) (v V, err error) {
|
||||
v, _ = m[i]
|
||||
return
|
||||
}
|
||||
|
||||
// EncodeDecodeAble is implemented by types that can be encoded and decoded for
|
||||
// Minecraft protocol packets.
|
||||
type EncodeDecodeAble interface {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// Code generated by strom. DO NOT EDIT.
|
||||
// source: minecraft-data/pc/1.12.2/protocol.json (sha256:21c57208db654a5e14a34cb696570080df179c5c642e53b16120399eee9232be)
|
||||
// version: (devel) (go1.26.2)
|
||||
// version: v0.6.6-0.20260805202908-e58499ed0924+dirty (go1.26.2)
|
||||
package v1_12_2
|
||||
|
||||
import (
|
||||
@@ -45,7 +45,7 @@ type EntityMetadata struct {
|
||||
Key uint8
|
||||
Type int8
|
||||
}
|
||||
Value EntityMetadataItem
|
||||
Value any
|
||||
}
|
||||
}
|
||||
|
||||
@@ -55,7 +55,7 @@ func (ret *EntityMetadata) Decode(r io.ReadSeeker) (err error) {
|
||||
Key uint8
|
||||
Type int8
|
||||
}
|
||||
Value EntityMetadataItem
|
||||
Value any
|
||||
})
|
||||
var id uint8
|
||||
for {
|
||||
@@ -75,7 +75,7 @@ func (ret *EntityMetadata) Decode(r io.ReadSeeker) (err error) {
|
||||
Key uint8
|
||||
Type int8
|
||||
}
|
||||
Value EntityMetadataItem
|
||||
Value any
|
||||
}
|
||||
err = binary.Read(r, binary.BigEndian, &entry.Anon.Key)
|
||||
if err != nil {
|
||||
@@ -85,9 +85,135 @@ 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 int32
|
||||
EntityMetadataInnerValue10Tmp, err = proto_base.DecodeVarInt(r)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
entry.Value = EntityMetadataInnerValue10Tmp
|
||||
case 11:
|
||||
var EntityMetadataInnerValue11Tmp *uuid.UUID
|
||||
var EntityMetadataInnerValue11TmpPresent bool
|
||||
err = binary.Read(r, binary.BigEndian, &EntityMetadataInnerValue11TmpPresent)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
if EntityMetadataInnerValue11TmpPresent {
|
||||
var EntityMetadataInnerValue11TmpPresentValue uuid.UUID
|
||||
_, err = io.ReadFull(r, EntityMetadataInnerValue11TmpPresentValue[:])
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
EntityMetadataInnerValue11Tmp = &EntityMetadataInnerValue11TmpPresentValue
|
||||
}
|
||||
entry.Value = EntityMetadataInnerValue11Tmp
|
||||
case 12:
|
||||
var EntityMetadataInnerValue12Tmp int32
|
||||
EntityMetadataInnerValue12Tmp, err = proto_base.DecodeVarInt(r)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
entry.Value = EntityMetadataInnerValue12Tmp
|
||||
case 13:
|
||||
var EntityMetadataInnerValue13Tmp nbt.Tag
|
||||
err = EntityMetadataInnerValue13Tmp.Decode(r)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
entry.Value = EntityMetadataInnerValue13Tmp
|
||||
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 Slot
|
||||
err = EntityMetadataInnerValue5Tmp.Decode(r)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
entry.Value = EntityMetadataInnerValue5Tmp
|
||||
case 6:
|
||||
var EntityMetadataInnerValue6Tmp bool
|
||||
err = binary.Read(r, binary.BigEndian, &EntityMetadataInnerValue6Tmp)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
entry.Value = EntityMetadataInnerValue6Tmp
|
||||
case 7:
|
||||
var EntityMetadataInnerValue7Tmp struct {
|
||||
Pitch float32
|
||||
Yaw float32
|
||||
Roll float32
|
||||
}
|
||||
err = binary.Read(r, binary.BigEndian, &EntityMetadataInnerValue7Tmp.Pitch)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = binary.Read(r, binary.BigEndian, &EntityMetadataInnerValue7Tmp.Yaw)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = binary.Read(r, binary.BigEndian, &EntityMetadataInnerValue7Tmp.Roll)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
entry.Value = EntityMetadataInnerValue7Tmp
|
||||
case 8:
|
||||
var EntityMetadataInnerValue8Tmp Position
|
||||
err = EntityMetadataInnerValue8Tmp.Decode(r)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
entry.Value = EntityMetadataInnerValue8Tmp
|
||||
case 9:
|
||||
var EntityMetadataInnerValue9Tmp *Position
|
||||
var EntityMetadataInnerValue9TmpPresent bool
|
||||
err = binary.Read(r, binary.BigEndian, &EntityMetadataInnerValue9TmpPresent)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
if EntityMetadataInnerValue9TmpPresent {
|
||||
var EntityMetadataInnerValue9TmpPresentValue Position
|
||||
err = EntityMetadataInnerValue9TmpPresentValue.Decode(r)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
EntityMetadataInnerValue9Tmp = &EntityMetadataInnerValue9TmpPresentValue
|
||||
}
|
||||
entry.Value = EntityMetadataInnerValue9Tmp
|
||||
}
|
||||
ret.Val[id] = entry
|
||||
}
|
||||
@@ -103,10 +229,175 @@ 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.(int32)
|
||||
if !ok {
|
||||
err = proto_base.BadTypeError
|
||||
return
|
||||
}
|
||||
err = proto_base.EncodeVarInt(w, EntityMetadataValue)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
case 11:
|
||||
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 12:
|
||||
EntityMetadataValue, ok := v.Value.(int32)
|
||||
if !ok {
|
||||
err = proto_base.BadTypeError
|
||||
return
|
||||
}
|
||||
err = proto_base.EncodeVarInt(w, EntityMetadataValue)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
case 13:
|
||||
EntityMetadataValue, ok := v.Value.(nbt.Tag)
|
||||
if !ok {
|
||||
err = proto_base.BadTypeError
|
||||
return
|
||||
}
|
||||
EntityMetadataValueEncTmp := EntityMetadataValue
|
||||
err = EntityMetadataValueEncTmp.Encode(w)
|
||||
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.(Slot)
|
||||
if !ok {
|
||||
err = proto_base.BadTypeError
|
||||
return
|
||||
}
|
||||
EntityMetadataValueEncTmp := EntityMetadataValue
|
||||
err = EntityMetadataValueEncTmp.Encode(w)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
case 6:
|
||||
EntityMetadataValue, ok := v.Value.(bool)
|
||||
if !ok {
|
||||
err = proto_base.BadTypeError
|
||||
return
|
||||
}
|
||||
err = binary.Write(w, binary.BigEndian, EntityMetadataValue)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
case 7:
|
||||
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 8:
|
||||
EntityMetadataValue, ok := v.Value.(Position)
|
||||
if !ok {
|
||||
err = proto_base.BadTypeError
|
||||
return
|
||||
}
|
||||
EntityMetadataValueEncTmp := EntityMetadataValue
|
||||
err = EntityMetadataValueEncTmp.Encode(w)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
case 9:
|
||||
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
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
err = binary.Write(w, binary.BigEndian, uint8(255))
|
||||
@@ -141,17 +432,17 @@ func (ret *Position) Decode(r io.ReadSeeker) (err error) {
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
ret.X = int32(PositionPacked << 0 >> 38)
|
||||
if ret.X >= 1<<25 {
|
||||
ret.X -= 1 << 26
|
||||
ret.Z = int32(PositionPacked >> 0 & 67108863)
|
||||
if ret.Z >= 1<<25 {
|
||||
ret.Z -= 1 << 26
|
||||
}
|
||||
ret.Y = int16(PositionPacked << 26 >> 52)
|
||||
ret.Y = int16(PositionPacked >> 26 & 4095)
|
||||
if ret.Y >= 1<<11 {
|
||||
ret.Y -= 1 << 12
|
||||
}
|
||||
ret.Z = int32(PositionPacked << 38 >> 38)
|
||||
if ret.Z >= 1<<25 {
|
||||
ret.Z -= 1 << 26
|
||||
ret.X = int32(PositionPacked >> 38 & 67108863)
|
||||
if ret.X >= 1<<25 {
|
||||
ret.X -= 1 << 26
|
||||
}
|
||||
return
|
||||
}
|
||||
@@ -2519,10 +2810,10 @@ func (ret *PlayToClientPacketAdvancements) Decode(r io.ReadSeeker) (err error) {
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
PlayToClientPacketAdvancementsAdvancementMappingElementValueDisplayDataPresentValue.Flags.Unused = PlayToClientPacketAdvancementsAdvancementMappingElementValueDisplayDataFlagsPacked << 0 >> 3
|
||||
PlayToClientPacketAdvancementsAdvancementMappingElementValueDisplayDataPresentValue.Flags.Hidden = PlayToClientPacketAdvancementsAdvancementMappingElementValueDisplayDataFlagsPacked<<29>>31 == 1
|
||||
PlayToClientPacketAdvancementsAdvancementMappingElementValueDisplayDataPresentValue.Flags.ShowToast = PlayToClientPacketAdvancementsAdvancementMappingElementValueDisplayDataFlagsPacked<<30>>31 == 1
|
||||
PlayToClientPacketAdvancementsAdvancementMappingElementValueDisplayDataPresentValue.Flags.HasBackgroundTexture = PlayToClientPacketAdvancementsAdvancementMappingElementValueDisplayDataFlagsPacked<<31>>31 == 1
|
||||
PlayToClientPacketAdvancementsAdvancementMappingElementValueDisplayDataPresentValue.Flags.HasBackgroundTexture = PlayToClientPacketAdvancementsAdvancementMappingElementValueDisplayDataFlagsPacked>>0&1 == 1
|
||||
PlayToClientPacketAdvancementsAdvancementMappingElementValueDisplayDataPresentValue.Flags.ShowToast = PlayToClientPacketAdvancementsAdvancementMappingElementValueDisplayDataFlagsPacked>>1&1 == 1
|
||||
PlayToClientPacketAdvancementsAdvancementMappingElementValueDisplayDataPresentValue.Flags.Hidden = PlayToClientPacketAdvancementsAdvancementMappingElementValueDisplayDataFlagsPacked>>2&1 == 1
|
||||
PlayToClientPacketAdvancementsAdvancementMappingElementValueDisplayDataPresentValue.Flags.Unused = PlayToClientPacketAdvancementsAdvancementMappingElementValueDisplayDataFlagsPacked >> 3 & 536870911
|
||||
switch PlayToClientPacketAdvancementsAdvancementMappingElementValueDisplayDataPresentValue.Flags.HasBackgroundTexture {
|
||||
case true:
|
||||
var PlayToClientPacketAdvancementsAdvancementMappingElementValueDisplayDataBackgroundTexture1Tmp string
|
||||
@@ -8288,11 +8579,182 @@ type PlayToClientPacketWorldParticles struct {
|
||||
}
|
||||
|
||||
func (ret *PlayToClientPacketWorldParticles) Decode(r io.ReadSeeker) (err error) {
|
||||
err = proto_base.ToDoError
|
||||
err = binary.Read(r, binary.BigEndian, &ret.ParticleId)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = binary.Read(r, binary.BigEndian, &ret.LongDistance)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = binary.Read(r, binary.BigEndian, &ret.X)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = binary.Read(r, binary.BigEndian, &ret.Y)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = binary.Read(r, binary.BigEndian, &ret.Z)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = binary.Read(r, binary.BigEndian, &ret.OffsetX)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = binary.Read(r, binary.BigEndian, &ret.OffsetY)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = binary.Read(r, binary.BigEndian, &ret.OffsetZ)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = binary.Read(r, binary.BigEndian, &ret.ParticleData)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = binary.Read(r, binary.BigEndian, &ret.Particles)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
switch ret.ParticleId {
|
||||
case 36:
|
||||
var PlayToClientPacketWorldParticlesData36Tmp []int32
|
||||
var lPlayToClientPacketWorldParticlesData36Tmp int32
|
||||
lPlayToClientPacketWorldParticlesData36Tmp = 2
|
||||
PlayToClientPacketWorldParticlesData36Tmp = []int32{}
|
||||
for range lPlayToClientPacketWorldParticlesData36Tmp {
|
||||
var PlayToClientPacketWorldParticlesData36TmpElement int32
|
||||
PlayToClientPacketWorldParticlesData36TmpElement, err = proto_base.DecodeVarInt(r)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
PlayToClientPacketWorldParticlesData36Tmp = append(PlayToClientPacketWorldParticlesData36Tmp, PlayToClientPacketWorldParticlesData36TmpElement)
|
||||
}
|
||||
ret.Data = PlayToClientPacketWorldParticlesData36Tmp
|
||||
case 37:
|
||||
var PlayToClientPacketWorldParticlesData37Tmp []int32
|
||||
var lPlayToClientPacketWorldParticlesData37Tmp int32
|
||||
lPlayToClientPacketWorldParticlesData37Tmp = 1
|
||||
PlayToClientPacketWorldParticlesData37Tmp = []int32{}
|
||||
for range lPlayToClientPacketWorldParticlesData37Tmp {
|
||||
var PlayToClientPacketWorldParticlesData37TmpElement int32
|
||||
PlayToClientPacketWorldParticlesData37TmpElement, err = proto_base.DecodeVarInt(r)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
PlayToClientPacketWorldParticlesData37Tmp = append(PlayToClientPacketWorldParticlesData37Tmp, PlayToClientPacketWorldParticlesData37TmpElement)
|
||||
}
|
||||
ret.Data = PlayToClientPacketWorldParticlesData37Tmp
|
||||
case 38:
|
||||
var PlayToClientPacketWorldParticlesData38Tmp []int32
|
||||
var lPlayToClientPacketWorldParticlesData38Tmp int32
|
||||
lPlayToClientPacketWorldParticlesData38Tmp = 1
|
||||
PlayToClientPacketWorldParticlesData38Tmp = []int32{}
|
||||
for range lPlayToClientPacketWorldParticlesData38Tmp {
|
||||
var PlayToClientPacketWorldParticlesData38TmpElement int32
|
||||
PlayToClientPacketWorldParticlesData38TmpElement, err = proto_base.DecodeVarInt(r)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
PlayToClientPacketWorldParticlesData38Tmp = append(PlayToClientPacketWorldParticlesData38Tmp, PlayToClientPacketWorldParticlesData38TmpElement)
|
||||
}
|
||||
ret.Data = PlayToClientPacketWorldParticlesData38Tmp
|
||||
default:
|
||||
var PlayToClientPacketWorldParticlesDataTmp struct {
|
||||
}
|
||||
ret.Data = PlayToClientPacketWorldParticlesDataTmp
|
||||
}
|
||||
return
|
||||
}
|
||||
func (ret *PlayToClientPacketWorldParticles) Encode(w io.Writer) (err error) {
|
||||
err = proto_base.ToDoError
|
||||
err = binary.Write(w, binary.BigEndian, ret.ParticleId)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = binary.Write(w, binary.BigEndian, ret.LongDistance)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = binary.Write(w, binary.BigEndian, ret.X)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = binary.Write(w, binary.BigEndian, ret.Y)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = binary.Write(w, binary.BigEndian, ret.Z)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = binary.Write(w, binary.BigEndian, ret.OffsetX)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = binary.Write(w, binary.BigEndian, ret.OffsetY)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = binary.Write(w, binary.BigEndian, ret.OffsetZ)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = binary.Write(w, binary.BigEndian, ret.ParticleData)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = binary.Write(w, binary.BigEndian, ret.Particles)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
switch ret.ParticleId {
|
||||
case 36:
|
||||
PlayToClientPacketWorldParticlesData, ok := ret.Data.([]int32)
|
||||
if !ok {
|
||||
err = proto_base.BadTypeError
|
||||
return
|
||||
}
|
||||
for iPlayToClientPacketWorldParticlesData := range len(PlayToClientPacketWorldParticlesData) {
|
||||
err = proto_base.EncodeVarInt(w, PlayToClientPacketWorldParticlesData[iPlayToClientPacketWorldParticlesData])
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
case 37:
|
||||
PlayToClientPacketWorldParticlesData, ok := ret.Data.([]int32)
|
||||
if !ok {
|
||||
err = proto_base.BadTypeError
|
||||
return
|
||||
}
|
||||
for iPlayToClientPacketWorldParticlesData := range len(PlayToClientPacketWorldParticlesData) {
|
||||
err = proto_base.EncodeVarInt(w, PlayToClientPacketWorldParticlesData[iPlayToClientPacketWorldParticlesData])
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
case 38:
|
||||
PlayToClientPacketWorldParticlesData, ok := ret.Data.([]int32)
|
||||
if !ok {
|
||||
err = proto_base.BadTypeError
|
||||
return
|
||||
}
|
||||
for iPlayToClientPacketWorldParticlesData := range len(PlayToClientPacketWorldParticlesData) {
|
||||
err = proto_base.EncodeVarInt(w, PlayToClientPacketWorldParticlesData[iPlayToClientPacketWorldParticlesData])
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
default:
|
||||
_, ok := ret.Data.(struct {
|
||||
})
|
||||
if !ok {
|
||||
err = proto_base.BadTypeError
|
||||
return
|
||||
}
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
+1793
-43
File diff suppressed because it is too large
Load Diff
+1866
-52
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
+1412
-39
File diff suppressed because it is too large
Load Diff
+1412
-39
File diff suppressed because it is too large
Load Diff
@@ -1,6 +1,6 @@
|
||||
// Code generated by strom. DO NOT EDIT.
|
||||
// source: minecraft-data/pc/1.8/protocol.json (sha256:79fe774bfc255dd281899c004fbb9c7adc40fb107de9353da1dd0371ea4b53af)
|
||||
// version: (devel) (go1.26.2)
|
||||
// version: v0.6.6-0.20260805202908-e58499ed0924+dirty (go1.26.2)
|
||||
package v1_8
|
||||
|
||||
import (
|
||||
@@ -45,7 +45,7 @@ type EntityMetadata struct {
|
||||
Type uint8
|
||||
Key uint8
|
||||
}
|
||||
Value EntityMetadataItem
|
||||
Value any
|
||||
}
|
||||
}
|
||||
|
||||
@@ -55,7 +55,7 @@ func (ret *EntityMetadata) Decode(r io.ReadSeeker) (err error) {
|
||||
Type uint8
|
||||
Key uint8
|
||||
}
|
||||
Value EntityMetadataItem
|
||||
Value any
|
||||
})
|
||||
var id uint8
|
||||
for {
|
||||
@@ -75,18 +75,96 @@ func (ret *EntityMetadata) Decode(r io.ReadSeeker) (err error) {
|
||||
Type uint8
|
||||
Key uint8
|
||||
}
|
||||
Value EntityMetadataItem
|
||||
Value any
|
||||
}
|
||||
var EntityMetadataInnerAnonPacked uint8
|
||||
err = binary.Read(r, binary.BigEndian, &EntityMetadataInnerAnonPacked)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
entry.Anon.Type = EntityMetadataInnerAnonPacked << 0 >> 5
|
||||
entry.Anon.Key = EntityMetadataInnerAnonPacked << 3 >> 3
|
||||
err = entry.Value.Decode(r)
|
||||
if err != nil {
|
||||
return
|
||||
entry.Anon.Key = EntityMetadataInnerAnonPacked >> 0 & 31
|
||||
entry.Anon.Type = EntityMetadataInnerAnonPacked >> 5 & 7
|
||||
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 int16
|
||||
err = binary.Read(r, binary.BigEndian, &EntityMetadataInnerValue1Tmp)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
entry.Value = EntityMetadataInnerValue1Tmp
|
||||
case 2:
|
||||
var EntityMetadataInnerValue2Tmp int32
|
||||
err = binary.Read(r, binary.BigEndian, &EntityMetadataInnerValue2Tmp)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
entry.Value = EntityMetadataInnerValue2Tmp
|
||||
case 3:
|
||||
var EntityMetadataInnerValue3Tmp float32
|
||||
err = binary.Read(r, binary.BigEndian, &EntityMetadataInnerValue3Tmp)
|
||||
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 Slot
|
||||
err = EntityMetadataInnerValue5Tmp.Decode(r)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
entry.Value = EntityMetadataInnerValue5Tmp
|
||||
case 6:
|
||||
var EntityMetadataInnerValue6Tmp struct {
|
||||
X int32
|
||||
Y int32
|
||||
Z int32
|
||||
}
|
||||
err = binary.Read(r, binary.BigEndian, &EntityMetadataInnerValue6Tmp.X)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = binary.Read(r, binary.BigEndian, &EntityMetadataInnerValue6Tmp.Y)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = binary.Read(r, binary.BigEndian, &EntityMetadataInnerValue6Tmp.Z)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
entry.Value = EntityMetadataInnerValue6Tmp
|
||||
case 7:
|
||||
var EntityMetadataInnerValue7Tmp struct {
|
||||
Pitch float32
|
||||
Yaw float32
|
||||
Roll float32
|
||||
}
|
||||
err = binary.Read(r, binary.BigEndian, &EntityMetadataInnerValue7Tmp.Pitch)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = binary.Read(r, binary.BigEndian, &EntityMetadataInnerValue7Tmp.Yaw)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = binary.Read(r, binary.BigEndian, &EntityMetadataInnerValue7Tmp.Roll)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
entry.Value = EntityMetadataInnerValue7Tmp
|
||||
}
|
||||
ret.Val[id] = entry
|
||||
}
|
||||
@@ -101,10 +179,112 @@ 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.(int16)
|
||||
if !ok {
|
||||
err = proto_base.BadTypeError
|
||||
return
|
||||
}
|
||||
err = binary.Write(w, binary.BigEndian, EntityMetadataValue)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
case 2:
|
||||
EntityMetadataValue, ok := v.Value.(int32)
|
||||
if !ok {
|
||||
err = proto_base.BadTypeError
|
||||
return
|
||||
}
|
||||
err = binary.Write(w, binary.BigEndian, EntityMetadataValue)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
case 3:
|
||||
EntityMetadataValue, ok := v.Value.(float32)
|
||||
if !ok {
|
||||
err = proto_base.BadTypeError
|
||||
return
|
||||
}
|
||||
err = binary.Write(w, binary.BigEndian, 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.(Slot)
|
||||
if !ok {
|
||||
err = proto_base.BadTypeError
|
||||
return
|
||||
}
|
||||
EntityMetadataValueEncTmp := EntityMetadataValue
|
||||
err = EntityMetadataValueEncTmp.Encode(w)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
case 6:
|
||||
EntityMetadataValue, ok := v.Value.(struct {
|
||||
X int32
|
||||
Y int32
|
||||
Z int32
|
||||
})
|
||||
if !ok {
|
||||
err = proto_base.BadTypeError
|
||||
return
|
||||
}
|
||||
err = binary.Write(w, binary.BigEndian, EntityMetadataValue.X)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = binary.Write(w, binary.BigEndian, EntityMetadataValue.Y)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = binary.Write(w, binary.BigEndian, EntityMetadataValue.Z)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
case 7:
|
||||
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
|
||||
}
|
||||
}
|
||||
}
|
||||
err = binary.Write(w, binary.BigEndian, uint8(127))
|
||||
@@ -139,17 +319,17 @@ func (ret *Position) Decode(r io.ReadSeeker) (err error) {
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
ret.X = int32(PositionPacked << 0 >> 38)
|
||||
if ret.X >= 1<<25 {
|
||||
ret.X -= 1 << 26
|
||||
ret.Z = int32(PositionPacked >> 0 & 67108863)
|
||||
if ret.Z >= 1<<25 {
|
||||
ret.Z -= 1 << 26
|
||||
}
|
||||
ret.Y = int16(PositionPacked << 26 >> 52)
|
||||
ret.Y = int16(PositionPacked >> 26 & 4095)
|
||||
if ret.Y >= 1<<11 {
|
||||
ret.Y -= 1 << 12
|
||||
}
|
||||
ret.Z = int32(PositionPacked << 38 >> 38)
|
||||
if ret.Z >= 1<<25 {
|
||||
ret.Z -= 1 << 26
|
||||
ret.X = int32(PositionPacked >> 38 & 67108863)
|
||||
if ret.X >= 1<<25 {
|
||||
ret.X -= 1 << 26
|
||||
}
|
||||
return
|
||||
}
|
||||
@@ -7105,11 +7285,182 @@ type PlayToClientPacketWorldParticles struct {
|
||||
}
|
||||
|
||||
func (ret *PlayToClientPacketWorldParticles) Decode(r io.ReadSeeker) (err error) {
|
||||
err = proto_base.ToDoError
|
||||
err = binary.Read(r, binary.BigEndian, &ret.ParticleId)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = binary.Read(r, binary.BigEndian, &ret.LongDistance)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = binary.Read(r, binary.BigEndian, &ret.X)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = binary.Read(r, binary.BigEndian, &ret.Y)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = binary.Read(r, binary.BigEndian, &ret.Z)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = binary.Read(r, binary.BigEndian, &ret.OffsetX)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = binary.Read(r, binary.BigEndian, &ret.OffsetY)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = binary.Read(r, binary.BigEndian, &ret.OffsetZ)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = binary.Read(r, binary.BigEndian, &ret.ParticleData)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = binary.Read(r, binary.BigEndian, &ret.Particles)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
switch ret.ParticleId {
|
||||
case 36:
|
||||
var PlayToClientPacketWorldParticlesData36Tmp []int32
|
||||
var lPlayToClientPacketWorldParticlesData36Tmp int32
|
||||
lPlayToClientPacketWorldParticlesData36Tmp = 2
|
||||
PlayToClientPacketWorldParticlesData36Tmp = []int32{}
|
||||
for range lPlayToClientPacketWorldParticlesData36Tmp {
|
||||
var PlayToClientPacketWorldParticlesData36TmpElement int32
|
||||
PlayToClientPacketWorldParticlesData36TmpElement, err = proto_base.DecodeVarInt(r)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
PlayToClientPacketWorldParticlesData36Tmp = append(PlayToClientPacketWorldParticlesData36Tmp, PlayToClientPacketWorldParticlesData36TmpElement)
|
||||
}
|
||||
ret.Data = PlayToClientPacketWorldParticlesData36Tmp
|
||||
case 37:
|
||||
var PlayToClientPacketWorldParticlesData37Tmp []int32
|
||||
var lPlayToClientPacketWorldParticlesData37Tmp int32
|
||||
lPlayToClientPacketWorldParticlesData37Tmp = 1
|
||||
PlayToClientPacketWorldParticlesData37Tmp = []int32{}
|
||||
for range lPlayToClientPacketWorldParticlesData37Tmp {
|
||||
var PlayToClientPacketWorldParticlesData37TmpElement int32
|
||||
PlayToClientPacketWorldParticlesData37TmpElement, err = proto_base.DecodeVarInt(r)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
PlayToClientPacketWorldParticlesData37Tmp = append(PlayToClientPacketWorldParticlesData37Tmp, PlayToClientPacketWorldParticlesData37TmpElement)
|
||||
}
|
||||
ret.Data = PlayToClientPacketWorldParticlesData37Tmp
|
||||
case 38:
|
||||
var PlayToClientPacketWorldParticlesData38Tmp []int32
|
||||
var lPlayToClientPacketWorldParticlesData38Tmp int32
|
||||
lPlayToClientPacketWorldParticlesData38Tmp = 1
|
||||
PlayToClientPacketWorldParticlesData38Tmp = []int32{}
|
||||
for range lPlayToClientPacketWorldParticlesData38Tmp {
|
||||
var PlayToClientPacketWorldParticlesData38TmpElement int32
|
||||
PlayToClientPacketWorldParticlesData38TmpElement, err = proto_base.DecodeVarInt(r)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
PlayToClientPacketWorldParticlesData38Tmp = append(PlayToClientPacketWorldParticlesData38Tmp, PlayToClientPacketWorldParticlesData38TmpElement)
|
||||
}
|
||||
ret.Data = PlayToClientPacketWorldParticlesData38Tmp
|
||||
default:
|
||||
var PlayToClientPacketWorldParticlesDataTmp struct {
|
||||
}
|
||||
ret.Data = PlayToClientPacketWorldParticlesDataTmp
|
||||
}
|
||||
return
|
||||
}
|
||||
func (ret *PlayToClientPacketWorldParticles) Encode(w io.Writer) (err error) {
|
||||
err = proto_base.ToDoError
|
||||
err = binary.Write(w, binary.BigEndian, ret.ParticleId)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = binary.Write(w, binary.BigEndian, ret.LongDistance)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = binary.Write(w, binary.BigEndian, ret.X)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = binary.Write(w, binary.BigEndian, ret.Y)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = binary.Write(w, binary.BigEndian, ret.Z)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = binary.Write(w, binary.BigEndian, ret.OffsetX)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = binary.Write(w, binary.BigEndian, ret.OffsetY)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = binary.Write(w, binary.BigEndian, ret.OffsetZ)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = binary.Write(w, binary.BigEndian, ret.ParticleData)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = binary.Write(w, binary.BigEndian, ret.Particles)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
switch ret.ParticleId {
|
||||
case 36:
|
||||
PlayToClientPacketWorldParticlesData, ok := ret.Data.([]int32)
|
||||
if !ok {
|
||||
err = proto_base.BadTypeError
|
||||
return
|
||||
}
|
||||
for iPlayToClientPacketWorldParticlesData := range len(PlayToClientPacketWorldParticlesData) {
|
||||
err = proto_base.EncodeVarInt(w, PlayToClientPacketWorldParticlesData[iPlayToClientPacketWorldParticlesData])
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
case 37:
|
||||
PlayToClientPacketWorldParticlesData, ok := ret.Data.([]int32)
|
||||
if !ok {
|
||||
err = proto_base.BadTypeError
|
||||
return
|
||||
}
|
||||
for iPlayToClientPacketWorldParticlesData := range len(PlayToClientPacketWorldParticlesData) {
|
||||
err = proto_base.EncodeVarInt(w, PlayToClientPacketWorldParticlesData[iPlayToClientPacketWorldParticlesData])
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
case 38:
|
||||
PlayToClientPacketWorldParticlesData, ok := ret.Data.([]int32)
|
||||
if !ok {
|
||||
err = proto_base.BadTypeError
|
||||
return
|
||||
}
|
||||
for iPlayToClientPacketWorldParticlesData := range len(PlayToClientPacketWorldParticlesData) {
|
||||
err = proto_base.EncodeVarInt(w, PlayToClientPacketWorldParticlesData[iPlayToClientPacketWorldParticlesData])
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
default:
|
||||
_, ok := ret.Data.(struct {
|
||||
})
|
||||
if !ok {
|
||||
err = proto_base.BadTypeError
|
||||
return
|
||||
}
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
+1412
-39
File diff suppressed because it is too large
Load Diff
+1605
-77
File diff suppressed because it is too large
Load Diff
@@ -7,6 +7,7 @@ import (
|
||||
"go/ast"
|
||||
"go/token"
|
||||
"io"
|
||||
"maps"
|
||||
"os"
|
||||
"runtime/debug"
|
||||
"slices"
|
||||
@@ -56,6 +57,7 @@ type Generator struct {
|
||||
EncoderNatives map[string]FunctionGeneratorFunc
|
||||
CompareToNatives map[string]CompareToGeneratorFunc
|
||||
Protocol Protocol
|
||||
RawTypes map[string]map[string]any
|
||||
File *ast.File
|
||||
|
||||
// These persist in the current GenerateType call
|
||||
@@ -129,6 +131,11 @@ func (g *Generator) VisitNameAndData(tName string, tData any) (e ast.Expr, err e
|
||||
}
|
||||
t, found := g.Protocol.Types.Types[tName]
|
||||
if t != "native" && found {
|
||||
if tData != nil {
|
||||
if _, ok := g.mergeCompareTo(tName, t, tData); ok {
|
||||
return Ident("any"), nil
|
||||
}
|
||||
}
|
||||
return Ident(util2.CamelCase(tName)), nil
|
||||
}
|
||||
t, found = g.CurrentlyGeneratingTypes.Types[tName]
|
||||
@@ -152,6 +159,14 @@ func (g *Generator) VisitDecoder(varToSet ast.Expr, data any, name string) (e []
|
||||
if found {
|
||||
return d(g, varToSet, tData, name)
|
||||
}
|
||||
if tData != nil {
|
||||
if merged, ok := g.mergeCompareTo(tName, g.Protocol.Types.Types[tName], tData); ok {
|
||||
s, found := g.DecoderNatives[merged.tName]
|
||||
if found {
|
||||
return s(g, varToSet, merged.data, name)
|
||||
}
|
||||
}
|
||||
}
|
||||
t, found := g.Protocol.Types.Types[tName]
|
||||
if t == "native" {
|
||||
err = fmt.Errorf("decoder native not implemented %v", tName)
|
||||
@@ -160,6 +175,55 @@ func (g *Generator) VisitDecoder(varToSet ast.Expr, data any, name string) (e []
|
||||
return DefaultDecoder(g, varToSet, tData, name)
|
||||
}
|
||||
|
||||
type mergedType struct {
|
||||
tName string
|
||||
data any
|
||||
}
|
||||
|
||||
func (g *Generator) mergeCompareTo(tName string, t any, overrideData any) (mergedType, bool) {
|
||||
overrideMap, ok := overrideData.(map[string]any)
|
||||
if !ok {
|
||||
return mergedType{}, false
|
||||
}
|
||||
overrideCompareTo, hasOverride := overrideMap["compareTo"]
|
||||
if !hasOverride {
|
||||
return mergedType{}, false
|
||||
}
|
||||
if s, ok := overrideCompareTo.(string); ok && strings.HasPrefix(s, "$") {
|
||||
return mergedType{}, false
|
||||
}
|
||||
var typeMap map[string]any
|
||||
var nativeName string
|
||||
if m, ok := t.(map[string]any); ok {
|
||||
typeMap = m
|
||||
nativeName = "container"
|
||||
} else if a, ok := t.([]any); ok && len(a) >= 2 {
|
||||
if m, ok := a[1].(map[string]any); ok {
|
||||
typeMap = m
|
||||
}
|
||||
if s, ok := a[0].(string); ok {
|
||||
nativeName = s
|
||||
}
|
||||
} else {
|
||||
m, ok := g.RawTypes[tName]
|
||||
if !ok {
|
||||
return mergedType{}, false
|
||||
}
|
||||
typeMap = m
|
||||
nativeName = "switch"
|
||||
}
|
||||
typeCompareTo, hasType := typeMap["compareTo"]
|
||||
if !hasType {
|
||||
return mergedType{}, false
|
||||
}
|
||||
if s, ok := typeCompareTo.(string); !ok || !strings.HasPrefix(s, "$") {
|
||||
return mergedType{}, false
|
||||
}
|
||||
merged := maps.Clone(typeMap)
|
||||
merged["compareTo"] = overrideCompareTo
|
||||
return mergedType{tName: nativeName, data: merged}, true
|
||||
}
|
||||
|
||||
func (g *Generator) VisitEncoder(varToSet ast.Expr, data any, name string) (e []ast.Stmt, err error) {
|
||||
g.Depth += 1
|
||||
defer func() { g.Depth -= 1 }()
|
||||
@@ -172,6 +236,14 @@ func (g *Generator) VisitEncoder(varToSet ast.Expr, data any, name string) (e []
|
||||
if found {
|
||||
return d(g, varToSet, tData, name)
|
||||
}
|
||||
if tData != nil {
|
||||
if merged, ok := g.mergeCompareTo(tName, g.Protocol.Types.Types[tName], tData); ok {
|
||||
s, found := g.EncoderNatives[merged.tName]
|
||||
if found {
|
||||
return s(g, varToSet, merged.data, name)
|
||||
}
|
||||
}
|
||||
}
|
||||
t, found := g.Protocol.Types.Types[tName]
|
||||
if t == "native" {
|
||||
err = fmt.Errorf("encoder native not implemented %v", tName)
|
||||
@@ -357,6 +429,20 @@ func Generate(version string, w io.Writer, sourceHash string) (packetInfos []Pac
|
||||
|
||||
g := &Generator{Protocol: protocol}
|
||||
|
||||
g.RawTypes = make(map[string]map[string]any)
|
||||
for k, v := range protocol.Types.Types {
|
||||
if m, ok := v.(map[string]any); ok {
|
||||
g.RawTypes[k] = m
|
||||
}
|
||||
if a, ok := v.([]any); ok && len(a) == 2 {
|
||||
if m, ok := a[1].(map[string]any); ok {
|
||||
if _, has := m["fields"]; has {
|
||||
g.RawTypes[k] = m
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
g.File = NewFile("v" + strings.ReplaceAll(version, ".", "_"))
|
||||
|
||||
// Add file header comment for IDE recognition and reproducibility
|
||||
|
||||
@@ -59,6 +59,13 @@ func ContainerCompareTo(g *Generator, parts []string, inExpr ast.Expr, dataRaw a
|
||||
if field.Name == name {
|
||||
return g.VisitCompareTo(parts, SelectorExprAndStr(inExpr, util2.CamelCase(field.Name)), field.Type)
|
||||
}
|
||||
if field.Anon {
|
||||
anonParts := append([]string{name}, parts...)
|
||||
e, cet, err2 := g.VisitCompareTo(anonParts, SelectorExprAndStr(inExpr, "Anon"), field.Type)
|
||||
if err2 == nil {
|
||||
return e, cet, nil
|
||||
}
|
||||
}
|
||||
}
|
||||
err = errors.New("field not found")
|
||||
return
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"go/ast"
|
||||
"go/token"
|
||||
"slices"
|
||||
@@ -124,13 +125,14 @@ func ArrayDecoder(g *Generator, varToSet ast.Expr, dataRaw any, name string) (s
|
||||
return
|
||||
}
|
||||
} else {
|
||||
countStr := fmt.Sprint(data.Count)
|
||||
var n int
|
||||
n, err = strconv.Atoi(data.Count)
|
||||
n, err = strconv.Atoi(countStr)
|
||||
var e ast.Expr
|
||||
if err == nil {
|
||||
e = NumLit(n)
|
||||
} else {
|
||||
e, _, err = g.ParseCompareTo(data.Count)
|
||||
e, _, err = g.ParseCompareTo(countStr)
|
||||
}
|
||||
s2 = append(s2, Assign121(Ident(lName), e))
|
||||
}
|
||||
@@ -223,7 +225,7 @@ func MultiTypeFix(s string, t *CaseExprType) (e ast.Expr) {
|
||||
*t = ct
|
||||
return
|
||||
}
|
||||
if *t == ct {
|
||||
if *t == ct || (*t == CaseExprTypeOnlyNumber && ct == CaseExprTypeNumber) || (*t == CaseExprTypeOnlyBool && ct == CaseExprTypeBool) || (*t == CaseExprTypeNumber && ct == CaseExprTypeOnlyNumber) || (*t == CaseExprTypeBool && ct == CaseExprTypeOnlyBool) {
|
||||
return
|
||||
}
|
||||
|
||||
@@ -398,6 +400,7 @@ func BitFieldDecoder(g *Generator, varToSet ast.Expr, dataRaw any, name string)
|
||||
}
|
||||
s = append(s, packedVarStmt)
|
||||
s = append(s, stmts...)
|
||||
slices.Reverse(data)
|
||||
lShiftBy := 0
|
||||
for _, field := range data {
|
||||
var fieldTypeProtodef string
|
||||
@@ -411,16 +414,13 @@ func BitFieldDecoder(g *Generator, varToSet ast.Expr, dataRaw any, name string)
|
||||
return
|
||||
}
|
||||
|
||||
rShiftBy := totalSize - field.Size
|
||||
fieldToSet := SelectorExprAndStr(varToSet, util2.CamelCase(field.Name))
|
||||
|
||||
mask := (1 << field.Size) - 1
|
||||
var getDataExpr ast.Expr
|
||||
getDataExpr = RightShift(
|
||||
LeftShift(
|
||||
Ident(packed),
|
||||
NumLit(lShiftBy)),
|
||||
NumLit(rShiftBy),
|
||||
)
|
||||
getDataExpr = BinAnd(
|
||||
RightShift(Ident(packed), NumLit(lShiftBy)),
|
||||
NumLit(mask))
|
||||
if fieldTypeProtodef == "bool" {
|
||||
getDataExpr = Equals(getDataExpr, NumLit(1))
|
||||
} else if fieldTypeProtodef != packedTypeProtodef {
|
||||
@@ -454,56 +454,38 @@ func RegistryEntryHolderSetDecoder(g *Generator, varToSet ast.Expr, dataRaw any,
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
var countType ast.Expr
|
||||
countType, err = g.VisitType("varint")
|
||||
idName := name + "Id"
|
||||
varIntType, err := g.VisitNameAndData("varint", nil)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
IdVar := VarStmt(idName, varIntType)
|
||||
idDecodeStatements, err := g.VisitDecoder(Ident(idName), "varint", name)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
baseType, err := g.VisitType(data.Base.Type)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
otherwiseArrayType, err := g.VisitNameAndData("array", map[string]any{"type": data.Otherwise.Type})
|
||||
resName := name + "Result"
|
||||
var basePath []ast.Stmt
|
||||
basePath = append(basePath, VarStmt(resName, baseType))
|
||||
baseDecodeStatements, err := g.VisitDecoder(Ident(resName), data.Base.Type, name+"Base")
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
otherwiseType, err := g.VisitType(data.Otherwise.Type)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
lName := "l" + util2.CamelCase(name)
|
||||
s1 := VarStmt(lName, countType)
|
||||
s2, err := g.VisitDecoder(Ident(lName), "varint", name)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
s3 := Assign121(Ident(lName), Sub(Ident(lName), NumLit(1)))
|
||||
resultName := name + "Result"
|
||||
b1s1 := VarStmt(resultName, baseType)
|
||||
b1s2, err := g.VisitDecoder(Ident(resultName), data.Base.Type, resultName)
|
||||
b1s3 := Assign121(varToSet, Ident(resultName))
|
||||
b1s4 := Return()
|
||||
var b1 []ast.Stmt
|
||||
b1 = append(b1, b1s1)
|
||||
b1 = append(b1, b1s2...)
|
||||
b1 = append(b1, b1s3)
|
||||
b1 = append(b1, b1s4)
|
||||
basePath = append(basePath, baseDecodeStatements...)
|
||||
basePath = append(basePath, Assign121(varToSet, Ident(resName)))
|
||||
|
||||
tName := name + "Element"
|
||||
rangeStatements := Stmts(VarStmt(tName, otherwiseType))
|
||||
rangeStatementsDecode, err := g.VisitDecoder(Ident(tName), data.Otherwise.Type, tName)
|
||||
rangeStatements = append(rangeStatements, rangeStatementsDecode...)
|
||||
rangeStatements = append(rangeStatements, Assign121(Ident(resultName), Call(Ident("append"), Ident(resultName), Ident(tName))))
|
||||
idPath := IfElse(NotEquals(Ident(idName), NumLit(0)),
|
||||
NewBlockEllipsis(Assign121(varToSet, Ident(idName))),
|
||||
NewBlock(basePath))
|
||||
|
||||
s5 := If(Equals(Ident(lName), NumLit(-1)), NewBlock(b1))
|
||||
s6 := VarStmt(resultName, otherwiseArrayType)
|
||||
s7 := ForRange(nil, Ident(lName), NewBlock(rangeStatements))
|
||||
s = append(s, s1)
|
||||
s = append(s, s2...)
|
||||
s = append(s, s3)
|
||||
s = append(s, s5)
|
||||
s = append(s, s6)
|
||||
s = append(s, s7)
|
||||
s = Stmts(IdVar)
|
||||
s = append(s, idDecodeStatements...)
|
||||
s = append(s, idPath)
|
||||
return
|
||||
}
|
||||
|
||||
@@ -617,6 +599,56 @@ func EntityMetadataLoopDecoder(g *Generator, varToSet ast.Expr, dataRaw any, nam
|
||||
return
|
||||
}
|
||||
|
||||
func TopBitSetTerminatedArrayDecoder(g *Generator, varToSet ast.Expr, dataRaw any, name string) (s []ast.Stmt, err error) {
|
||||
var data struct {
|
||||
Type any
|
||||
}
|
||||
err = mapstructure.Decode(dataRaw, &data)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
normalType, err := g.VisitType(data.Type)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
arrayType, err := g.VisitNameAndData("array", dataRaw)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
tName := name + "Element"
|
||||
hasMore := name + "HasMore"
|
||||
headerName := name + "Header"
|
||||
|
||||
peekStmts := Stmts(
|
||||
VarStmt(headerName, Ident("uint8")),
|
||||
Assign(Exprs(Ident("err")), Exprs(Call(Selector("binary", "Read"), Ident("r"), Selector("binary", "BigEndian"), AddrOf(Ident(headerName))))),
|
||||
If(Equals(Ident("err"), Selector("io", "EOF")),
|
||||
NewBlockEllipsis(Assign121(Ident("err"), Nil()), Break())),
|
||||
IfErrNil(),
|
||||
Assign(Exprs(Ident("_"), Ident("err")), Exprs(Call(Selector("r", "Seek"), NumLit(-1), Selector("io", "SeekCurrent")))),
|
||||
IfErrNil(),
|
||||
Define121(Ident(hasMore), NotEquals(BinAnd(Ident(headerName), NumLit(0x80)), NumLit(0))),
|
||||
)
|
||||
|
||||
rangeStatements := Stmts(VarStmt(tName, normalType))
|
||||
s5, err := g.VisitDecoder(Ident(tName), data.Type, tName)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
rangeStatements = append(rangeStatements, s5...)
|
||||
rangeStatements = append(rangeStatements, Assign121(varToSet, Call(Ident("append"), varToSet, Ident(tName))))
|
||||
rangeStatements = append(rangeStatements, If(Not(Ident(hasMore)), NewBlockEllipsis(Break())))
|
||||
|
||||
loopStmts := append(peekStmts, rangeStatements...)
|
||||
s = Stmts(
|
||||
Assign121(varToSet, CompLit(arrayType, Exprs())),
|
||||
ForStmt(nil, nil, nil, NewBlock(loopStmts)),
|
||||
)
|
||||
return
|
||||
}
|
||||
|
||||
func (g *Generator) RegisterDecoderNatives() {
|
||||
g.DecoderNatives = map[string]FunctionGeneratorFunc{
|
||||
"container": ContainerDecoder,
|
||||
@@ -653,9 +685,9 @@ func (g *Generator) RegisterDecoderNatives() {
|
||||
"bool": SimpleTypeDecoder,
|
||||
|
||||
"registryEntryHolder": RegistryEntryHolderDecoder,
|
||||
"registryEntryHolderSet": ToDoDecoder, // RegistryEntryHolderSetDecoder
|
||||
"registryEntryHolderSet": RegistryEntryHolderSetDecoder,
|
||||
"entityMetadataLoop": EntityMetadataLoopDecoder,
|
||||
"topBitSetTerminatedArray": ToDoDecoder,
|
||||
"topBitSetTerminatedArray": TopBitSetTerminatedArrayDecoder,
|
||||
"todo": ToDoDecoder,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,7 +4,6 @@ import (
|
||||
"go/ast"
|
||||
"go/token"
|
||||
"slices"
|
||||
"strconv"
|
||||
|
||||
"github.com/admin-else/strom/mc/proto_generator/protodef"
|
||||
util2 "github.com/admin-else/strom/mc/util"
|
||||
@@ -79,7 +78,7 @@ func ArrayEncoder(g *Generator, varToSet ast.Expr, dataRaw any, name string) (s
|
||||
iName := "i" + name
|
||||
//s, err = g.VisitEncoder(varToSet, data.Type, name)
|
||||
var s1 []ast.Stmt
|
||||
if data.Count == "" {
|
||||
if data.Count == nil {
|
||||
s1, err = g.VisitEncoder(Call(ct, Call(Ident("len"), varToSet)), data.CountType, name)
|
||||
if err != nil {
|
||||
return
|
||||
@@ -152,7 +151,16 @@ func BitFieldEncoder(g *Generator, varToSet ast.Expr, dataRaw any, name string)
|
||||
}
|
||||
packedVarName := name + "Packed"
|
||||
packedExpr := Ident(packedVarName)
|
||||
packedTypeStr := "uint" + strconv.Itoa(totalSize)
|
||||
packedTypeStr := "uint8"
|
||||
if totalSize > 8 {
|
||||
packedTypeStr = "uint16"
|
||||
}
|
||||
if totalSize > 16 {
|
||||
packedTypeStr = "uint32"
|
||||
}
|
||||
if totalSize > 32 {
|
||||
packedTypeStr = "uint64"
|
||||
}
|
||||
|
||||
s = append(s, VarStmt(packedVarName, Ident(packedTypeStr)))
|
||||
|
||||
@@ -185,7 +193,17 @@ func BitFieldEncoder(g *Generator, varToSet ast.Expr, dataRaw any, name string)
|
||||
shiftBy += field.Size
|
||||
}
|
||||
|
||||
encodePacked, err := g.VisitEncoder(packedExpr, "u"+strconv.Itoa(totalSize), name)
|
||||
packedProtoType := "u8"
|
||||
if totalSize > 8 {
|
||||
packedProtoType = "u16"
|
||||
}
|
||||
if totalSize > 16 {
|
||||
packedProtoType = "u32"
|
||||
}
|
||||
if totalSize > 32 {
|
||||
packedProtoType = "u64"
|
||||
}
|
||||
encodePacked, err := g.VisitEncoder(packedExpr, packedProtoType, name)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
@@ -388,6 +406,151 @@ func EntityMetadataLoopEncoder(g *Generator, vts ast.Expr, dataRaw any, name str
|
||||
return
|
||||
}
|
||||
|
||||
func TopBitSetTerminatedArrayEncoder(g *Generator, varToSet ast.Expr, dataRaw any, name string) (s []ast.Stmt, err error) {
|
||||
var data struct {
|
||||
Type any
|
||||
}
|
||||
err = mapstructure.Decode(dataRaw, &data)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
iName := "i" + name
|
||||
elemName := name + "Elem"
|
||||
|
||||
_, tData, err := ParseType(data.Type)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
var containerData protodef.Container
|
||||
if err = mapstructure.Decode(tData, &containerData); err != nil || len(containerData) == 0 {
|
||||
s2, err := g.VisitEncoder(SelectorExprAndStr(Ident(elemName), "Val"), data.Type, name+"Inner")
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
s = Stmts(ForRangeKV(Ident(iName), Ident(elemName), varToSet, NewBlock(s2)))
|
||||
return s, nil
|
||||
}
|
||||
|
||||
elemExpr := Ident(elemName)
|
||||
firstField := containerData[0]
|
||||
firstCName := util2.CamelCase(firstField.Name)
|
||||
firstVar := SelectorExprAndStr(elemExpr, firstCName)
|
||||
notLast := NotEquals(Ident(iName), Sub(Call(Ident("len"), varToSet), NumLit(1)))
|
||||
|
||||
var firstByteExpr ast.Expr
|
||||
if firstField.Anon {
|
||||
firstByteExpr = SelectorExprAndStr(firstVar, "Type") // or "Key"... need to handle bitfield
|
||||
} else {
|
||||
firstByteExpr = firstVar
|
||||
}
|
||||
|
||||
firstTypeName, _, _ := ParseType(firstField.Type)
|
||||
|
||||
var firstFieldStmts []ast.Stmt
|
||||
const msb = 0x80
|
||||
switch firstTypeName {
|
||||
case "i8":
|
||||
firstFieldStmts = Stmts(
|
||||
IfElse(notLast,
|
||||
NewBlock(Stmts(
|
||||
Assign121(Ident("err"),
|
||||
Call(Selector("binary", "Write"), Ident("w"), Selector("binary", "BigEndian"),
|
||||
Call(Ident("int8"),
|
||||
&ast.BinaryExpr{X: Call(Ident("uint8"), firstByteExpr), Op: token.OR, Y: NumLit(msb)}))),
|
||||
IfErrNil(),
|
||||
)),
|
||||
NewBlock(Stmts(
|
||||
Assign121(Ident("err"),
|
||||
Call(Selector("binary", "Write"), Ident("w"), Selector("binary", "BigEndian"), firstByteExpr)),
|
||||
IfErrNil(),
|
||||
))),
|
||||
)
|
||||
case "u8":
|
||||
firstFieldStmts = Stmts(
|
||||
IfElse(notLast,
|
||||
NewBlock(Stmts(
|
||||
Assign121(Ident("err"),
|
||||
Call(Selector("binary", "Write"), Ident("w"), Selector("binary", "BigEndian"),
|
||||
&ast.BinaryExpr{X: firstByteExpr, Op: token.OR, Y: NumLit(msb)})),
|
||||
IfErrNil(),
|
||||
)),
|
||||
NewBlock(Stmts(
|
||||
Assign121(Ident("err"),
|
||||
Call(Selector("binary", "Write"), Ident("w"), Selector("binary", "BigEndian"), firstByteExpr)),
|
||||
IfErrNil(),
|
||||
))),
|
||||
)
|
||||
default:
|
||||
firstFieldStmts, err = g.VisitEncoder(firstByteExpr, firstField.Type, name+firstCName)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
||||
var restStmts []ast.Stmt
|
||||
for _, field := range containerData[1:] {
|
||||
cName := util2.CamelCase(field.Name)
|
||||
if field.Anon {
|
||||
cName = "Anon"
|
||||
}
|
||||
fieldVar := SelectorExprAndStr(elemExpr, cName)
|
||||
fieldStmts, err := g.VisitEncoder(fieldVar, field.Type, name+util2.CamelCase(cName))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
restStmts = append(restStmts, fieldStmts...)
|
||||
}
|
||||
|
||||
elementStmts := append(firstFieldStmts, restStmts...)
|
||||
s = Stmts(ForRangeKV(Ident(iName), Ident(elemName), varToSet, NewBlock(elementStmts)))
|
||||
return
|
||||
}
|
||||
|
||||
func RegistryEntryHolderSetEncoder(g *Generator, varToSet ast.Expr, dataRaw any, name string) (s []ast.Stmt, err error) {
|
||||
var data protodef.RegistryEntryHolderSet
|
||||
err = mapstructure.Decode(dataRaw, &data)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
baseType, err := g.VisitType(data.Base.Type)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
otherwiseType, err := g.VisitType(data.Otherwise.Type)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
knownTypeName := name + "KnownType"
|
||||
|
||||
zeroEncode, err := g.VisitEncoder(NumLit(0), "varint", name+"Zero")
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
baseEncodeStatements, err := g.VisitEncoder(Ident(knownTypeName), data.Base.Type, name+"Base")
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
baseEncodeStatements = append(zeroEncode, baseEncodeStatements...)
|
||||
|
||||
otherwiseEncodeStatements, err := g.VisitEncoder(Ident(knownTypeName), data.Otherwise.Type, name+"Otherwise")
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
statements := Stmts()
|
||||
statements = append(statements, Case(Exprs(baseType), baseEncodeStatements))
|
||||
statements = append(statements, Case(Exprs(otherwiseType), otherwiseEncodeStatements))
|
||||
statements = append(statements, Case(nil, Stmts(Assign121(Ident("err"), Selector("proto_base", "BadTypeError")))))
|
||||
|
||||
s = Stmts(TypeSwitch(Define121(Ident(knownTypeName), TypeAssert(varToSet, Ident("type"))), NewBlock(statements)))
|
||||
return
|
||||
}
|
||||
|
||||
func (g *Generator) RegisterEncoderNatives() {
|
||||
g.EncoderNatives = map[string]FunctionGeneratorFunc{
|
||||
"container": ContainerEncoder,
|
||||
@@ -424,9 +587,9 @@ func (g *Generator) RegisterEncoderNatives() {
|
||||
"bool": SimpleTypeEncoder,
|
||||
|
||||
"registryEntryHolder": RegistryEntryHolderEncoder,
|
||||
"registryEntryHolderSet": ToDoEncoder,
|
||||
"registryEntryHolderSet": RegistryEntryHolderSetEncoder,
|
||||
"entityMetadataLoop": EntityMetadataLoopEncoder,
|
||||
"topBitSetTerminatedArray": ToDoEncoder,
|
||||
"topBitSetTerminatedArray": TopBitSetTerminatedArrayEncoder,
|
||||
"todo": ToDoEncoder,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -225,7 +225,7 @@ func (g *Generator) RegisterNatives() {
|
||||
"string": MakeIdentVisitor("string"),
|
||||
"restBuffer": MakeSelectorVisitor("proto_base", "RestBuffer"),
|
||||
"bitflags": VisitBitFlagsType,
|
||||
"topBitSetTerminatedArray": VisitToDoType,
|
||||
"topBitSetTerminatedArray": VisitArrayTypeVisitorType,
|
||||
"todo": VisitToDoType,
|
||||
"lpVec3": MakeSelectorVisitor("proto_base", "LpVec3d"),
|
||||
}
|
||||
|
||||
@@ -35,7 +35,7 @@ type (
|
||||
|
||||
Array struct {
|
||||
CountType any
|
||||
Count string
|
||||
Count any
|
||||
Type any
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user