Mirror/Erupe
1
0
Fork 0
mirror of https://github.com/Mezeporta/Erupe.git synced 2026-03-28 02:23:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor(config): rename package _config to config with cfg alias

Browse Source 
The config package used `package _config` with a leading underscore,
which is unconventional in Go. Rename to `package config` (matching the
directory name) and use `cfg` as the standard import alias across all
93 importing files.
This commit is contained in:
Houmgaor
2026-02-21 13:20:15 +01:00
parent ad73f2fb55
commit f17cb96b52
98 changed files with 719 additions and 719 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
network/mhfpacket/mhfpacket_test.go
View File

@@ -5,7 +5,7 @@ import (
"testing"
"erupe-ce/common/byteframe"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network"
"erupe-ce/network/clientctx"
)
@@ -64,7 +64,7 @@ func TestMsgSysPingRoundTrip(t *testing.T) {
AckHandle: 0x12345678,
}
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
// Build
bf := byteframe.NewByteFrame()
@@ -106,7 +106,7 @@ func TestMsgSysTimeRoundTrip(t *testing.T) {
Timestamp: tt.timestamp,
}
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
// Build
bf := byteframe.NewByteFrame()
@@ -240,7 +240,7 @@ func TestParserInterface(t *testing.T) {
bf.WriteUint32(123)
_, _ = bf.Seek(0, io.SeekStart)
err := p.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
err := p.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
if err != nil {
t.Errorf("Parse() error = %v", err)
}
@@ -251,7 +251,7 @@ func TestBuilderInterface(t *testing.T) {
var b Builder = &MsgSysPing{AckHandle: 456}
bf := byteframe.NewByteFrame()
err := b.Build(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
err := b.Build(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
if err != nil {
t.Errorf("Build() error = %v", err)
}
@@ -274,7 +274,7 @@ func TestClientContextBuildSafe(t *testing.T) {
pkt := &MsgSysPing{AckHandle: 123}
bf := byteframe.NewByteFrame()
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
err := pkt.Build(bf, ctx)
if err != nil {
t.Logf("Build() returned error: %v", err)
@@ -284,7 +284,7 @@ func TestClientContextBuildSafe(t *testing.T) {
func TestMsgSysPingBuildFormat(t *testing.T) {
pkt := &MsgSysPing{AckHandle: 0x12345678}
bf := byteframe.NewByteFrame()
_ = pkt.Build(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
_ = pkt.Build(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
data := bf.Data()
if len(data) != 4 {
@@ -303,7 +303,7 @@ func TestMsgSysTimeBuildFormat(t *testing.T) {
Timestamp: 0xDEADBEEF,
}
bf := byteframe.NewByteFrame()
_ = pkt.Build(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
_ = pkt.Build(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
data := bf.Data()
if len(data) != 5 {
@@ -502,7 +502,7 @@ func TestMsgSysCreateStageParse(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysCreateStage{}
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
if err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -554,7 +554,7 @@ func TestMsgSysEnterStageParse(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysEnterStage{}
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
if err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -603,7 +603,7 @@ func TestMsgSysMoveStageParse(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysMoveStage{}
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
if err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -649,7 +649,7 @@ func TestMsgSysLockStageParse(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysLockStage{}
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
if err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -676,7 +676,7 @@ func TestMsgSysUnlockStageRoundTrip(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
// Build (returns NOT IMPLEMENTED)
original := &MsgSysUnlockStage{}
@@ -717,7 +717,7 @@ func TestMsgSysBackStageParse(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysBackStage{}
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
if err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -747,7 +747,7 @@ func TestMsgSysLogoutParse(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysLogout{}
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
if err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -801,7 +801,7 @@ func TestMsgSysLoginParse(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysLogin{}
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
if err != nil {
t.Fatalf("Parse() error = %v", err)
}

48
network/mhfpacket/msg_batch_parse_test.go
View File

@@ -5,7 +5,7 @@ import (
"testing"
"erupe-ce/common/byteframe"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network/clientctx"
)
@@ -53,7 +53,7 @@ func TestBatchParseAckHandleOnly(t *testing.T) {
{"MsgMhfLoadPlateMyset", &MsgMhfLoadPlateMyset{}},
}
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
for _, tc := range packets {
t.Run(tc.name, func(t *testing.T) {
bf := byteframe.NewByteFrame()
@@ -98,7 +98,7 @@ func TestBatchParseTwoUint32(t *testing.T) {
{"MsgMhfInfoJoint", &MsgMhfInfoJoint{}},
}
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
for _, tc := range packets {
t.Run(tc.name, func(t *testing.T) {
bf := byteframe.NewByteFrame()
@@ -117,7 +117,7 @@ func TestBatchParseTwoUint32(t *testing.T) {
// TestBatchParseMultiField tests packets with various field combinations.
func TestBatchParseMultiField(t *testing.T) {
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
t.Run("MsgMhfGetRengokuBinary", func(t *testing.T) {
bf := byteframe.NewByteFrame()
@@ -1042,7 +1042,7 @@ func TestBatchParseMultiField(t *testing.T) {
// TestBatchParseVariableLength tests packets with variable-length data.
func TestBatchParseVariableLength(t *testing.T) {
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
t.Run("MsgMhfSaveFavoriteQuest", func(t *testing.T) {
bf := byteframe.NewByteFrame()
@@ -1345,7 +1345,7 @@ func TestBatchParseArrangeGuildMember(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfArrangeGuildMember{}
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ}); err != nil {
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ}); err != nil {
t.Fatal(err)
}
if len(pkt.CharIDs) != 3 || pkt.CharIDs[2] != 30 {
@@ -1374,7 +1374,7 @@ func TestBatchParseUpdateGuildIcon(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfUpdateGuildIcon{}
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ}); err != nil {
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ}); err != nil {
t.Fatal(err)
}
if len(pkt.IconParts) != 1 || pkt.IconParts[0].Red != 0xFF {
@@ -1393,7 +1393,7 @@ func TestBatchParseSysLoadRegister(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysLoadRegister{}
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ}); err != nil {
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ}); err != nil {
t.Fatal(err)
}
if pkt.RegisterID != 2 || pkt.Values != 3 {
@@ -1413,7 +1413,7 @@ func TestBatchParseSysLoadRegisterNonZeroPadding(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysLoadRegister{}
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
if err != nil {
t.Errorf("unexpected error: %v", err)
}
@@ -1439,7 +1439,7 @@ func TestBatchParseSysOperateRegister(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysOperateRegister{}
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ}); err != nil {
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ}); err != nil {
t.Fatal(err)
}
if len(pkt.RawDataPayload) != 3 {
@@ -1458,7 +1458,7 @@ func TestBatchParseSysOperateRegisterNonZeroPadding(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysOperateRegister{}
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
if err != nil {
t.Errorf("unexpected error: %v", err)
}
@@ -1475,7 +1475,7 @@ func TestBatchParseSysOperateRegisterNonZeroPadding(t *testing.T) {
// TestBatchParseSysGetFile tests the conditional scenario file packet.
func TestBatchParseSysGetFile(t *testing.T) {
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
t.Run("non-scenario", func(t *testing.T) {
bf := byteframe.NewByteFrame()
@@ -1530,7 +1530,7 @@ func TestBatchParseSysTerminalLog(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysTerminalLog{}
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ}); err != nil {
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ}); err != nil {
t.Fatal(err)
}
if len(pkt.Entries) != 1 || pkt.Entries[0].Type1 != 1 {
@@ -1540,7 +1540,7 @@ func TestBatchParseSysTerminalLog(t *testing.T) {
// TestBatchParseNoOpPackets tests packets with empty Parse (return nil).
func TestBatchParseNoOpPackets(t *testing.T) {
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
bf := byteframe.NewByteFrame()
packets := []struct {
@@ -1564,7 +1564,7 @@ func TestBatchParseNoOpPackets(t *testing.T) {
// TestBatchParseNotImplemented tests that Parse returns NOT IMPLEMENTED for stub packets.
func TestBatchParseNotImplemented(t *testing.T) {
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
bf := byteframe.NewByteFrame()
packets := []MHFPacket{
@@ -1610,7 +1610,7 @@ func TestBatchParseNotImplemented(t *testing.T) {
// TestBatchBuildNotImplemented tests that Build returns NOT IMPLEMENTED for many packets.
func TestBatchBuildNotImplemented(t *testing.T) {
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
bf := byteframe.NewByteFrame()
packets := []MHFPacket{
@@ -1721,7 +1721,7 @@ func TestBatchBuildNotImplemented(t *testing.T) {
// TestBatchParseReserve188and18B tests reserve packets with AckHandle.
func TestBatchParseReserve188and18B(t *testing.T) {
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
for _, tc := range []struct {
name string
@@ -1743,7 +1743,7 @@ func TestBatchParseReserve188and18B(t *testing.T) {
// TestBatchParseStageStringPackets tests packets that read a stage ID string.
func TestBatchParseStageStringPackets(t *testing.T) {
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
t.Run("MsgSysGetStageBinary", func(t *testing.T) {
bf := byteframe.NewByteFrame()
@@ -1849,7 +1849,7 @@ func TestBatchParseStampcardStamp(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfStampcardStamp{}
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ}); err != nil {
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ}); err != nil {
t.Fatal(err)
}
if pkt.HR != 2 || pkt.GR != 3 || pkt.Stamps != 4 || pkt.Reward1 != 5 {
@@ -1870,7 +1870,7 @@ func TestBatchParseAnnounce(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfAnnounce{}
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ}); err != nil {
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ}); err != nil {
t.Fatal(err)
}
if pkt.IPAddress != 0x7F000001 || pkt.Port != 54001 {
@@ -1880,7 +1880,7 @@ func TestBatchParseAnnounce(t *testing.T) {
// TestBatchParseOprtMail tests conditional parsing.
func TestBatchParseOprtMail(t *testing.T) {
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
t.Run("delete", func(t *testing.T) {
bf := byteframe.NewByteFrame()
@@ -1926,7 +1926,7 @@ func TestBatchParsePostTowerInfo(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfPostTowerInfo{}
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ}); err != nil {
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ}); err != nil {
t.Fatal(err)
}
}
@@ -1934,7 +1934,7 @@ func TestBatchParsePostTowerInfo(t *testing.T) {
// TestBatchParseGuildHuntdata tests conditional guild huntdata.
// TestBatchParseAdditionalMultiField tests Parse for more packets with multiple fields.
func TestBatchParseAdditionalMultiField(t *testing.T) {
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
t.Run("MsgMhfAcquireFesta", func(t *testing.T) {
bf := byteframe.NewByteFrame()
@@ -2203,7 +2203,7 @@ func TestBatchParseAdditionalMultiField(t *testing.T) {
}
func TestBatchParseGuildHuntdata(t *testing.T) {
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
t.Run("operation_0", func(t *testing.T) {
bf := byteframe.NewByteFrame()

6
network/mhfpacket/msg_build_coverage_extended_test.go
View File

@@ -4,7 +4,7 @@ import (
"testing"
"erupe-ce/common/byteframe"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network/clientctx"
)
@@ -303,7 +303,7 @@ func TestBuildCoverage_NotImplemented_Extended(t *testing.T) {
{"MsgMhfEnumerateCampaign", &MsgMhfEnumerateCampaign{}},
}
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
bf := byteframe.NewByteFrame()
@@ -347,7 +347,7 @@ func TestParseCoverage_NotImplemented_Extended(t *testing.T) {
{"MsgMhfRegistGuildAdventureDiva", &MsgMhfRegistGuildAdventureDiva{}},
}
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
bf := byteframe.NewByteFrame()
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {

72
network/mhfpacket/msg_build_test.go
View File

@@ -6,7 +6,7 @@ import (
"testing"
"erupe-ce/common/byteframe"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network/clientctx"
)
@@ -26,7 +26,7 @@ func TestBuildParseDuplicateObject(t *testing.T) {
{"negative coords", 1, -1.0, -2.0, -3.0, 100, 200},
}
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
original := &MsgSysDuplicateObject{
@@ -84,7 +84,7 @@ func TestBuildParsePositionObject(t *testing.T) {
{"max object id", 0xFFFFFFFF, 999.999, -999.999, 0.001},
}
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
original := &MsgSysPositionObject{
@@ -137,7 +137,7 @@ func TestBuildParseCastedBinary(t *testing.T) {
{"larger payload", 42, 3, 4, []byte{0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A}},
}
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
original := &MsgSysCastedBinary{
@@ -188,7 +188,7 @@ func TestBuildParseLoadRegister(t *testing.T) {
{"max values", 0xFFFFFFFF, 0xFFFFFFFF, 255},
}
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
bf := byteframe.NewByteFrame()
@@ -231,7 +231,7 @@ func TestBuildParseOperateRegister(t *testing.T) {
{"large payload", 0xFFFFFFFF, 0xDEADBEEF, make([]byte, 256)},
}
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
bf := byteframe.NewByteFrame()
@@ -272,7 +272,7 @@ func TestBuildParseNotifyUserBinary(t *testing.T) {
{"max", 0xFFFFFFFF, 255},
}
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
original := &MsgSysNotifyUserBinary{
@@ -315,7 +315,7 @@ func TestBuildParseTime(t *testing.T) {
{"typical timestamp", false, 1700000000},
}
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
original := &MsgSysTime{
@@ -356,7 +356,7 @@ func TestBuildParseUpdateObjectBinary(t *testing.T) {
{"max", 0xFFFFFFFF, 0xFFFFFFFF},
}
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
original := &MsgSysUpdateObjectBinary{
@@ -401,7 +401,7 @@ func TestBuildParseArrangeGuildMember(t *testing.T) {
{"many members", 999, 400, []uint32{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}},
}
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
bf := byteframe.NewByteFrame()
@@ -452,7 +452,7 @@ func TestBuildParseEnumerateGuildMember(t *testing.T) {
{"large values", 0xFFFFFFFF, 0xDEADBEEF, 0xCAFEBABE},
}
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
bf := byteframe.NewByteFrame()
@@ -495,7 +495,7 @@ func TestBuildParseStateCampaign(t *testing.T) {
{"max", 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFF},
}
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
bf := byteframe.NewByteFrame()
@@ -537,7 +537,7 @@ func TestBuildParseApplyCampaign(t *testing.T) {
{"max", 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFF, make([]byte, 16)},
}
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
bf := byteframe.NewByteFrame()
@@ -580,7 +580,7 @@ func TestBuildParseEnumerateCampaign(t *testing.T) {
{"zero", 0, 0, 0},
}
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
original := &MsgMhfEnumerateCampaign{
@@ -623,7 +623,7 @@ func TestBuildParseEnumerateEvent(t *testing.T) {
{"nonzero", 42},
}
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
original := &MsgMhfEnumerateEvent{
@@ -662,7 +662,7 @@ func TestBuildParseAddUdTacticsPoint(t *testing.T) {
{"max", 0xFFFFFFFF, 0xFFFF, 0xFFFFFFFF},
}
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
original := &MsgMhfAddUdTacticsPoint{
@@ -713,7 +713,7 @@ func TestBuildParseApplyDistItem(t *testing.T) {
{"max", 0xFFFFFFFF, 255, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF},
}
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
bf := byteframe.NewByteFrame()
@@ -761,7 +761,7 @@ func TestBuildParseEnumerateDistItem(t *testing.T) {
{"zero", 0, 0, 0, 0},
}
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
original := &MsgMhfEnumerateDistItem{
@@ -814,7 +814,7 @@ func TestBuildParseAcquireExchangeShop(t *testing.T) {
{"larger payload", 0xDEADBEEF, []byte{0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF, 0x11, 0x22}},
}
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
original := &MsgMhfAcquireExchangeShop{
@@ -850,7 +850,7 @@ func TestBuildParseAcquireExchangeShop(t *testing.T) {
// TestBuildParseDisplayedAchievement verifies Parse for MsgMhfDisplayedAchievement.
// This struct has no exported fields; Parse only discards a single zeroed byte.
func TestBuildParseDisplayedAchievement(t *testing.T) {
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
bf := byteframe.NewByteFrame()
bf.WriteUint8(0) // Zeroed (discarded by Parse)
_, _ = bf.Seek(0, io.SeekStart)
@@ -873,7 +873,7 @@ func TestBuildParseAddKouryouPoint(t *testing.T) {
{"max", 0xFFFFFFFF, 0xFFFFFFFF},
}
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
original := &MsgMhfAddKouryouPoint{
@@ -914,7 +914,7 @@ func TestBuildParseCheckDailyCafepoint(t *testing.T) {
{"zero", 0, 0},
}
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
bf := byteframe.NewByteFrame()
@@ -948,7 +948,7 @@ func TestBuildParsePing(t *testing.T) {
{"max", 0xFFFFFFFF},
}
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
original := &MsgSysPing{
@@ -984,7 +984,7 @@ func TestBuildParseDeleteObject(t *testing.T) {
{"max", 0xFFFFFFFF},
}
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
original := &MsgSysDeleteObject{
@@ -1020,7 +1020,7 @@ func TestBuildParseNotifyRegister(t *testing.T) {
{"max", 0xFFFFFFFF},
}
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
original := &MsgSysNotifyRegister{
@@ -1048,7 +1048,7 @@ func TestBuildParseNotifyRegister(t *testing.T) {
// TestBuildParseUnlockStage verifies Parse for MsgSysUnlockStage.
// This struct has no exported fields; Parse only discards a single zeroed uint16.
func TestBuildParseUnlockStage(t *testing.T) {
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
bf := byteframe.NewByteFrame()
bf.WriteUint16(0) // Zeroed (discarded by Parse)
_, _ = bf.Seek(0, io.SeekStart)
@@ -1069,7 +1069,7 @@ func TestBuildParseUnlockGlobalSema(t *testing.T) {
{"zero", 0},
}
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
original := &MsgSysUnlockGlobalSema{
@@ -1097,7 +1097,7 @@ func TestBuildParseUnlockGlobalSema(t *testing.T) {
// TestBuildParseStageDestruct verifies Build/Parse round-trip for MsgSysStageDestruct.
// This packet has no fields at all.
func TestBuildParseStageDestruct(t *testing.T) {
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
original := &MsgSysStageDestruct{}
bf := byteframe.NewByteFrame()
@@ -1118,7 +1118,7 @@ func TestBuildParseStageDestruct(t *testing.T) {
// TestBuildParseCastedBinaryPayloadIntegrity verifies that a large payload is preserved
// exactly through Build/Parse for MsgSysCastedBinary.
func TestBuildParseCastedBinaryPayloadIntegrity(t *testing.T) {
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
// Build a payload with recognizable pattern
payload := make([]byte, 1024)
@@ -1160,7 +1160,7 @@ func TestBuildParseCastedBinaryPayloadIntegrity(t *testing.T) {
// manual-build/Parse for MsgSysOperateRegister.
// Build is NOT IMPLEMENTED, so we manually write the binary representation.
func TestBuildParseOperateRegisterPayloadIntegrity(t *testing.T) {
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
payload := make([]byte, 512)
for i := range payload {
@@ -1190,7 +1190,7 @@ func TestBuildParseOperateRegisterPayloadIntegrity(t *testing.T) {
// Build is NOT IMPLEMENTED, so we manually write the binary representation.
// Parse reads: uint32 AckHandle, uint32 GuildID, uint8 zeroed, uint8 charCount.
func TestBuildParseArrangeGuildMemberEmptySlice(t *testing.T) {
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
bf := byteframe.NewByteFrame()
bf.WriteUint32(1) // AckHandle
@@ -1217,7 +1217,7 @@ func TestBuildParseArrangeGuildMemberEmptySlice(t *testing.T) {
// TestBuildBinaryFormat verifies the exact binary output format of a Build call
// for MsgSysDuplicateObject to ensure correct endianness and field ordering.
func TestBuildBinaryFormat(t *testing.T) {
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
pkt := &MsgSysDuplicateObject{
ObjID: 0x00000001,
X: 0,
@@ -1257,7 +1257,7 @@ func TestBuildBinaryFormat(t *testing.T) {
// TestBuildParseTimeBooleanEncoding verifies that the boolean field in MsgSysTime
// is encoded/decoded correctly for both true and false.
func TestBuildParseTimeBooleanEncoding(t *testing.T) {
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
for _, val := range []bool{true, false} {
t.Run("GetRemoteTime="+boolStr(val), func(t *testing.T) {
@@ -1303,7 +1303,7 @@ func boolStr(b bool) string {
// TestBuildParseSysAckBufferSmall verifies MsgSysAck round-trip with buffer response
// using the normal (non-extended) size field.
func TestBuildParseSysAckBufferSmall(t *testing.T) {
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
payload := []byte{0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08}
original := &MsgSysAck{
@@ -1341,7 +1341,7 @@ func TestBuildParseSysAckBufferSmall(t *testing.T) {
// TestBuildParseSysAckExtendedSize verifies MsgSysAck round-trip with a payload
// large enough to trigger the extended size field (>= 0xFFFF bytes).
func TestBuildParseSysAckExtendedSize(t *testing.T) {
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
payload := make([]byte, 0x10000) // 65536 bytes, triggers extended size
for i := range payload {
payload[i] = byte(i % 256)
@@ -1376,7 +1376,7 @@ func TestBuildParseSysAckExtendedSize(t *testing.T) {
// TestBuildParseSysAckNonBuffer verifies MsgSysAck round-trip with non-buffer response
// (exactly 4 bytes of data always read in Parse).
func TestBuildParseSysAckNonBuffer(t *testing.T) {
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
original := &MsgSysAck{
AckHandle: 100,
IsBufferResponse: false,

10
network/mhfpacket/msg_comprehensive_test.go
View File

@@ -5,7 +5,7 @@ import (
"testing"
"erupe-ce/common/byteframe"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network"
"erupe-ce/network/clientctx"
)
@@ -497,7 +497,7 @@ func TestAckHandlePacketsParse(t *testing.T) {
{"MsgMhfGetKijuInfo", network.MSG_MHF_GET_KIJU_INFO},
}
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
@@ -547,7 +547,7 @@ func TestAddAchievementParse(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfAddAchievement{}
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
if err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -587,7 +587,7 @@ func TestGetAchievementParse(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfGetAchievement{}
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
if err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -630,7 +630,7 @@ func TestBuildNotImplemented(t *testing.T) {
for _, pkt := range packetsToTest {
t.Run(pkt.Opcode().String(), func(t *testing.T) {
bf := byteframe.NewByteFrame()
err := pkt.Build(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
err := pkt.Build(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
if err == nil {
t.Logf("Build() did not return error (implementation may exist)")
} else {

4
network/mhfpacket/msg_mhf_acquire_cafe_item.go
View File

@@ -2,7 +2,7 @@ package mhfpacket
import (
"errors"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/common/byteframe"
"erupe-ce/network"
@@ -31,7 +31,7 @@ func (m *MsgMhfAcquireCafeItem) Parse(bf *byteframe.ByteFrame, ctx *clientctx.Cl
m.ItemType = bf.ReadUint16()
m.ItemID = bf.ReadUint16()
m.Quant = bf.ReadUint16()
if ctx.RealClientMode >= _config.G6 {
if ctx.RealClientMode >= cfg.G6 {
m.PointCost = bf.ReadUint32()
} else {
m.PointCost = uint32(bf.ReadUint16())

10
network/mhfpacket/msg_mhf_acquire_cafe_item_test.go
View File

@@ -5,7 +5,7 @@ import (
"testing"
"erupe-ce/common/byteframe"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network"
"erupe-ce/network/clientctx"
)
@@ -31,7 +31,7 @@ func TestMsgMhfAcquireCafeItemParse(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfAcquireCafeItem{}
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
err := pkt.Parse(bf, ctx)
if err != nil {
@@ -90,7 +90,7 @@ func TestMsgMhfAcquireCafeItemParseUint32PointCost(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfAcquireCafeItem{}
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
err := pkt.Parse(bf, ctx)
if err != nil {
@@ -119,7 +119,7 @@ func TestMsgMhfAcquireCafeItemParseFieldOrder(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfAcquireCafeItem{}
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
if err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -154,7 +154,7 @@ func TestMsgMhfAcquireCafeItemBuildNotImplemented(t *testing.T) {
}
bf := byteframe.NewByteFrame()
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
err := pkt.Build(bf, ctx)
if err == nil {

14
network/mhfpacket/msg_mhf_acquire_test.go
View File

@@ -5,7 +5,7 @@ import (
"testing"
"erupe-ce/common/byteframe"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network"
"erupe-ce/network/clientctx"
)
@@ -52,7 +52,7 @@ func TestMsgMhfAcquireGuildTresureParse(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfAcquireGuildTresure{}
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
if err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -93,7 +93,7 @@ func TestMsgMhfAcquireTitleParse(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfAcquireTitle{}
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
if err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -134,7 +134,7 @@ func TestMsgMhfAcquireDistItemParse(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfAcquireDistItem{}
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
if err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -178,7 +178,7 @@ func TestMsgMhfAcquireMonthlyItemParse(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfAcquireMonthlyItem{}
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
if err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -232,7 +232,7 @@ func TestAcquirePacketEdgeCases(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfAcquireGuildTresure{}
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
if err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -251,7 +251,7 @@ func TestAcquirePacketEdgeCases(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfAcquireDistItem{}
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
if err != nil {
t.Fatalf("Parse() error = %v for type %d", err, i)
}

6
network/mhfpacket/msg_mhf_apply_dist_item.go
View File

@@ -3,7 +3,7 @@ package mhfpacket
import (
"errors"
"erupe-ce/common/byteframe"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network"
"erupe-ce/network/clientctx"
)
@@ -27,10 +27,10 @@ func (m *MsgMhfApplyDistItem) Parse(bf *byteframe.ByteFrame, ctx *clientctx.Clie
m.AckHandle = bf.ReadUint32()
m.DistributionType = bf.ReadUint8()
m.DistributionID = bf.ReadUint32()
if ctx.RealClientMode >= _config.G8 {
if ctx.RealClientMode >= cfg.G8 {
m.Unk2 = bf.ReadUint32()
}
if ctx.RealClientMode >= _config.G10 {
if ctx.RealClientMode >= cfg.G10 {
m.Unk3 = bf.ReadUint32()
}
return nil

4
network/mhfpacket/msg_mhf_enumerate_dist_item.go
View File

@@ -3,7 +3,7 @@ package mhfpacket
import (
"errors"
"erupe-ce/common/byteframe"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network"
"erupe-ce/network/clientctx"
)
@@ -28,7 +28,7 @@ func (m *MsgMhfEnumerateDistItem) Parse(bf *byteframe.ByteFrame, ctx *clientctx.
m.DistType = bf.ReadUint8()
m.Unk1 = bf.ReadUint8()
m.MaxCount = bf.ReadUint16() // Hardcoded to 256
if ctx.RealClientMode >= _config.Z1 {
if ctx.RealClientMode >= cfg.Z1 {
m.Unk3 = bf.ReadBytes(uint(bf.ReadUint8()))
}
return nil

4
network/mhfpacket/msg_mhf_enumerate_quest.go
View File

@@ -2,7 +2,7 @@ package mhfpacket
import (
"errors"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/common/byteframe"
"erupe-ce/network"
@@ -30,7 +30,7 @@ func (m *MsgMhfEnumerateQuest) Parse(bf *byteframe.ByteFrame, ctx *clientctx.Cli
m.Unk0 = bf.ReadUint8()
m.World = bf.ReadUint8()
m.Counter = bf.ReadUint16()
if ctx.RealClientMode <= _config.Z1 {
if ctx.RealClientMode <= cfg.Z1 {
m.Offset = uint16(bf.ReadUint8())
} else {
m.Offset = bf.ReadUint16()

4
network/mhfpacket/msg_mhf_enumerate_shop.go
View File

@@ -2,7 +2,7 @@ package mhfpacket
import (
"errors"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/common/byteframe"
"erupe-ce/network"
@@ -32,7 +32,7 @@ func (m *MsgMhfEnumerateShop) Parse(bf *byteframe.ByteFrame, ctx *clientctx.Clie
m.ShopID = bf.ReadUint32()
m.Limit = bf.ReadUint16()
m.Unk3 = bf.ReadUint8()
if ctx.RealClientMode >= _config.G2 {
if ctx.RealClientMode >= cfg.G2 {
m.Unk4 = bf.ReadUint8()
m.Unk5 = bf.ReadUint32()
}

20
network/mhfpacket/msg_mhf_guacot_test.go
View File

@@ -4,7 +4,7 @@ import (
"testing"
"erupe-ce/common/byteframe"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network"
"erupe-ce/network/clientctx"
)
@@ -41,7 +41,7 @@ func TestMsgMhfUpdateGuacotParse_SingleEntry(t *testing.T) {
pkt := &MsgMhfUpdateGuacot{}
_, _ = bf.Seek(0, 0)
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
if err != nil {
t.Fatalf("Parse() error: %v", err)
}
@@ -102,7 +102,7 @@ func TestMsgMhfUpdateGuacotParse_MultipleEntries(t *testing.T) {
pkt := &MsgMhfUpdateGuacot{}
_, _ = bf.Seek(0, 0)
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
if err != nil {
t.Fatalf("Parse() error: %v", err)
}
@@ -132,7 +132,7 @@ func TestMsgMhfUpdateGuacotParse_ZeroEntries(t *testing.T) {
pkt := &MsgMhfUpdateGuacot{}
_, _ = bf.Seek(0, 0)
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
if err != nil {
t.Fatalf("Parse() error: %v", err)
}
@@ -163,7 +163,7 @@ func TestMsgMhfUpdateGuacotParse_DeletionEntry(t *testing.T) {
pkt := &MsgMhfUpdateGuacot{}
_, _ = bf.Seek(0, 0)
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
if err != nil {
t.Fatalf("Parse() error: %v", err)
}
@@ -190,7 +190,7 @@ func TestMsgMhfUpdateGuacotParse_EmptyName(t *testing.T) {
pkt := &MsgMhfUpdateGuacot{}
_, _ = bf.Seek(0, 0)
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
if err != nil {
t.Fatalf("Parse() error: %v", err)
}
@@ -208,7 +208,7 @@ func TestMsgMhfEnumerateGuacotParse(t *testing.T) {
pkt := &MsgMhfEnumerateGuacot{}
_, _ = bf.Seek(0, 0)
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
if err != nil {
t.Fatalf("Parse() error: %v", err)
}
@@ -223,7 +223,7 @@ func TestMsgMhfEnumerateGuacotParse(t *testing.T) {
func TestMsgMhfUpdateGuacotBuild_NotImplemented(t *testing.T) {
pkt := &MsgMhfUpdateGuacot{}
err := pkt.Build(byteframe.NewByteFrame(), &clientctx.ClientContext{RealClientMode: _config.ZZ})
err := pkt.Build(byteframe.NewByteFrame(), &clientctx.ClientContext{RealClientMode: cfg.ZZ})
if err == nil {
t.Error("Build() should return error (not implemented)")
}
@@ -231,7 +231,7 @@ func TestMsgMhfUpdateGuacotBuild_NotImplemented(t *testing.T) {
func TestMsgMhfEnumerateGuacotBuild_NotImplemented(t *testing.T) {
pkt := &MsgMhfEnumerateGuacot{}
err := pkt.Build(byteframe.NewByteFrame(), &clientctx.ClientContext{RealClientMode: _config.ZZ})
err := pkt.Build(byteframe.NewByteFrame(), &clientctx.ClientContext{RealClientMode: cfg.ZZ})
if err == nil {
t.Error("Build() should return error (not implemented)")
}
@@ -254,7 +254,7 @@ func TestGoocooStruct_Data1Size(t *testing.T) {
pkt := &MsgMhfUpdateGuacot{}
_, _ = bf.Seek(0, 0)
_ = pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
_ = pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
g := pkt.Goocoos[0]

4
network/mhfpacket/msg_mhf_packets_test.go
View File

@@ -5,7 +5,7 @@ import (
"testing"
"erupe-ce/common/byteframe"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network"
"erupe-ce/network/clientctx"
)
@@ -521,7 +521,7 @@ func TestAchievementPacketParse(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfAddAchievement{}
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
if err != nil {
t.Fatalf("Parse() error = %v", err)
}

4
network/mhfpacket/msg_mhf_savedata.go
View File

@@ -2,7 +2,7 @@ package mhfpacket
import (
"errors"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/common/byteframe"
"erupe-ce/network"
@@ -30,7 +30,7 @@ func (m *MsgMhfSavedata) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientCon
m.AllocMemSize = bf.ReadUint32()
m.SaveType = bf.ReadUint8()
m.Unk1 = bf.ReadUint32()
if ctx.RealClientMode >= _config.G1 {
if ctx.RealClientMode >= cfg.G1 {
m.DataSize = bf.ReadUint32()
}
if m.DataSize == 0 { // seems to be used when DataSize = 0 rather than on savetype?

6
network/mhfpacket/msg_mhf_stampcard_stamp.go
View File

@@ -2,7 +2,7 @@ package mhfpacket
import (
"errors"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/common/byteframe"
"erupe-ce/network"
@@ -32,12 +32,12 @@ func (m *MsgMhfStampcardStamp) Opcode() network.PacketID {
func (m *MsgMhfStampcardStamp) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
m.AckHandle = bf.ReadUint32()
m.HR = bf.ReadUint16()
if ctx.RealClientMode >= _config.G1 {
if ctx.RealClientMode >= cfg.G1 {
m.GR = bf.ReadUint16()
}
m.Stamps = bf.ReadUint16()
bf.ReadUint16() // Zeroed
if ctx.RealClientMode >= _config.Z2 {
if ctx.RealClientMode >= cfg.Z2 {
m.Reward1 = uint16(bf.ReadUint32())
m.Reward2 = uint16(bf.ReadUint32())
m.Item1 = uint16(bf.ReadUint32())

8
network/mhfpacket/msg_mhf_update_myhouse_info.go
View File

@@ -4,7 +4,7 @@ import (
"errors"
"erupe-ce/common/byteframe"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network"
"erupe-ce/network/clientctx"
)
@@ -23,11 +23,11 @@ func (m *MsgMhfUpdateMyhouseInfo) Opcode() network.PacketID {
// Parse parses the packet from binary
func (m *MsgMhfUpdateMyhouseInfo) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
m.AckHandle = bf.ReadUint32()
if ctx.RealClientMode >= _config.G10 {
if ctx.RealClientMode >= cfg.G10 {
m.Data = bf.ReadBytes(362)
} else if ctx.RealClientMode >= _config.GG {
} else if ctx.RealClientMode >= cfg.GG {
m.Data = bf.ReadBytes(338)
} else if ctx.RealClientMode >= _config.F5 {
} else if ctx.RealClientMode >= cfg.F5 {
// G1 is a guess
m.Data = bf.ReadBytes(314)
} else {

6
network/mhfpacket/msg_opcode_coverage_test.go
View File

@@ -5,7 +5,7 @@ import (
"testing"
"erupe-ce/common/byteframe"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network/clientctx"
)
@@ -247,7 +247,7 @@ func TestBuildCoverage_NotImplemented(t *testing.T) {
{"MsgSysReserve1AF", &MsgSysReserve1AF{}},
}
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
bf := byteframe.NewByteFrame()
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
@@ -285,7 +285,7 @@ func TestParseCoverage_NotImplemented(t *testing.T) {
{"MsgMhfUpdateGuild", &MsgMhfUpdateGuild{}},
}
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
bf := byteframe.NewByteFrame()
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {

14
network/mhfpacket/msg_parse_coverage_test.go
View File

@@ -5,7 +5,7 @@ import (
"erupe-ce/common/byteframe"
"erupe-ce/common/mhfcourse"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network/clientctx"
)
@@ -13,7 +13,7 @@ import (
// method is implemented (reads from ByteFrame) but was not yet covered by tests.
// Each test provides a ByteFrame with enough bytes for the Parse to succeed.
func TestParseCoverage_Implemented(t *testing.T) {
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
tests := []struct {
name string
@@ -76,7 +76,7 @@ func TestParseCoverage_Implemented(t *testing.T) {
// TestParseCoverage_VariableLength tests Parse for variable-length packets
// that require specific data layouts.
func TestParseCoverage_VariableLength(t *testing.T) {
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
t.Run("MsgMhfAcquireItem_EmptyList", func(t *testing.T) {
bf := byteframe.NewByteFrame()
@@ -240,7 +240,7 @@ func TestParseCoverage_VariableLength(t *testing.T) {
// TestBuildCoverage_Implemented tests Build() on packet types whose Build method
// is implemented (writes to ByteFrame) but was not yet covered.
func TestBuildCoverage_Implemented(t *testing.T) {
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
t.Run("MsgSysDeleteUser", func(t *testing.T) {
pkt := &MsgSysDeleteUser{CharID: 123}
@@ -307,7 +307,7 @@ func TestBuildCoverage_Implemented(t *testing.T) {
// TestParseCoverage_EmptyPackets tests Parse() for packets with no payload fields.
func TestParseCoverage_EmptyPackets(t *testing.T) {
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
t.Run("MsgSysCleanupObject_Parse", func(t *testing.T) {
bf := byteframe.NewByteFrame()
@@ -344,7 +344,7 @@ func TestParseCoverage_EmptyPackets(t *testing.T) {
// TestParseCoverage_NotImplemented2 tests Parse/Build for packets that return NOT IMPLEMENTED.
func TestParseCoverage_NotImplemented2(t *testing.T) {
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
t.Run("MsgSysGetObjectOwner_Parse", func(t *testing.T) {
bf := byteframe.NewByteFrame()
@@ -367,7 +367,7 @@ func TestParseCoverage_NotImplemented2(t *testing.T) {
// TestParseCoverage_UpdateWarehouse tests MsgMhfUpdateWarehouse.Parse with different box types.
func TestParseCoverage_UpdateWarehouse(t *testing.T) {
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
t.Run("EmptyChanges", func(t *testing.T) {
bf := byteframe.NewByteFrame()

54
network/mhfpacket/msg_parse_large_test.go
View File

@@ -6,13 +6,13 @@ import (
"testing"
"erupe-ce/common/byteframe"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network/clientctx"
)
// TestParseLargeMsgSysUpdateRightBuild tests Build for MsgSysUpdateRight (no Parse implementation).
func TestParseLargeMsgSysUpdateRightBuild(t *testing.T) {
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
original := &MsgSysUpdateRight{
ClientRespAckHandle: 0x12345678,
Bitfield: 0xDEADBEEF,
@@ -58,7 +58,7 @@ func TestParseLargeMsgMhfOperateWarehouse(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfOperateWarehouse{}
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ}); err != nil {
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ}); err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -93,7 +93,7 @@ func TestParseLargeMsgMhfOperateWarehouseEquip(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfOperateWarehouse{}
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ}); err != nil {
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ}); err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -133,7 +133,7 @@ func TestParseLargeMsgMhfLoadHouse(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfLoadHouse{}
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ}); err != nil {
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ}); err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -172,7 +172,7 @@ func TestParseLargeMsgMhfSendMail(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfSendMail{}
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ}); err != nil {
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ}); err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -233,7 +233,7 @@ func TestParseLargeMsgMhfApplyBbsArticle(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfApplyBbsArticle{}
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ}); err != nil {
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ}); err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -271,7 +271,7 @@ func TestParseLargeMsgMhfChargeFesta(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfChargeFesta{}
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ}); err != nil {
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ}); err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -306,7 +306,7 @@ func TestParseLargeMsgMhfChargeFestaZeroSouls(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfChargeFesta{}
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ}); err != nil {
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ}); err != nil {
t.Fatalf("Parse() error = %v", err)
}
if len(pkt.Souls) != 0 {
@@ -329,7 +329,7 @@ func TestParseLargeMsgMhfOperateJoint(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfOperateJoint{}
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ}); err != nil {
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ}); err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -365,7 +365,7 @@ func TestParseLargeMsgMhfOperationInvGuild(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfOperationInvGuild{}
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ}); err != nil {
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ}); err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -404,7 +404,7 @@ func TestParseLargeMsgMhfSaveMercenary(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfSaveMercenary{}
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ}); err != nil {
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ}); err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -446,7 +446,7 @@ func TestParseLargeMsgMhfUpdateHouse(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfUpdateHouse{}
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ}); err != nil {
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ}); err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -481,7 +481,7 @@ func TestParseLargeMsgSysCreateAcquireSemaphore(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysCreateAcquireSemaphore{}
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ}); err != nil {
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ}); err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -513,7 +513,7 @@ func TestParseLargeMsgMhfOperateGuild(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfOperateGuild{}
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ}); err != nil {
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ}); err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -553,7 +553,7 @@ func TestParseLargeMsgMhfReadBeatLevel(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfReadBeatLevel{}
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ}); err != nil {
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ}); err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -597,7 +597,7 @@ func TestParseLargeMsgSysCreateObject(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysCreateObject{}
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ}); err != nil {
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ}); err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -633,7 +633,7 @@ func TestParseLargeMsgSysLockGlobalSema(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysLockGlobalSema{}
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ}); err != nil {
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ}); err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -665,7 +665,7 @@ func TestParseLargeMsgMhfCreateJoint(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfCreateJoint{}
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ}); err != nil {
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ}); err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -690,7 +690,7 @@ func TestParseLargeMsgMhfGetUdTacticsRemainingPoint(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfGetUdTacticsRemainingPoint{}
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ}); err != nil {
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ}); err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -719,7 +719,7 @@ func TestParseLargeMsgMhfPostCafeDurationBonusReceived(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfPostCafeDurationBonusReceived{}
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ}); err != nil {
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ}); err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -745,7 +745,7 @@ func TestParseLargeMsgMhfPostCafeDurationBonusReceivedEmpty(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfPostCafeDurationBonusReceived{}
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ}); err != nil {
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ}); err != nil {
t.Fatalf("Parse() error = %v", err)
}
if len(pkt.CafeBonusID) != 0 {
@@ -763,7 +763,7 @@ func TestParseLargeMsgMhfRegistGuildAdventureDiva(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfRegistGuildAdventureDiva{}
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ}); err != nil {
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ}); err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -788,7 +788,7 @@ func TestParseLargeMsgMhfStateFestaG(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfStateFestaG{}
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ}); err != nil {
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ}); err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -813,7 +813,7 @@ func TestParseLargeMsgMhfStateFestaU(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfStateFestaU{}
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ}); err != nil {
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ}); err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -839,7 +839,7 @@ func TestParseLargeMsgSysEnumerateStage(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysEnumerateStage{}
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ}); err != nil {
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ}); err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -865,7 +865,7 @@ func TestParseLargeMsgSysReserveStage(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysReserveStage{}
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ}); err != nil {
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ}); err != nil {
t.Fatalf("Parse() error = %v", err)
}

32
network/mhfpacket/msg_parse_medium_test.go
View File

@@ -6,7 +6,7 @@ import (
"testing"
"erupe-ce/common/byteframe"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network/clientctx"
)
@@ -37,7 +37,7 @@ func TestParseMediumVoteFesta(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfVoteFesta{}
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ}); err != nil {
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ}); err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -82,7 +82,7 @@ func TestParseMediumAcquireSemaphore(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysAcquireSemaphore{}
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ}); err != nil {
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ}); err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -120,7 +120,7 @@ func TestParseMediumCheckSemaphore(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysCheckSemaphore{}
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ}); err != nil {
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ}); err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -157,7 +157,7 @@ func TestParseMediumGetUserBinary(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysGetUserBinary{}
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ}); err != nil {
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ}); err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -196,7 +196,7 @@ func TestParseMediumSetObjectBinary(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysSetObjectBinary{}
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ}); err != nil {
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ}); err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -235,7 +235,7 @@ func TestParseMediumSetUserBinary(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysSetUserBinary{}
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ}); err != nil {
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ}); err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -275,7 +275,7 @@ func TestParseMediumGetUdRanking(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfGetUdRanking{}
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ}); err != nil {
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ}); err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -310,7 +310,7 @@ func TestParseMediumGetUdTacticsRanking(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfGetUdTacticsRanking{}
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ}); err != nil {
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ}); err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -347,7 +347,7 @@ func TestParseMediumRegistGuildTresure(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfRegistGuildTresure{}
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ}); err != nil {
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ}); err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -378,7 +378,7 @@ func TestParseMediumUpdateMyhouseInfo(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfUpdateMyhouseInfo{}
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ}); err != nil {
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ}); err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -400,7 +400,7 @@ func TestParseMediumUpdateMyhouseInfo(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfUpdateMyhouseInfo{}
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ}); err != nil {
if err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ}); err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -518,7 +518,7 @@ func TestParseMediumAckHandleOnlyBatch(t *testing.T) {
},
}
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
ackValues := []uint32{0x12345678, 0, 0xFFFFFFFF, 0xDEADBEEF}
for _, tc := range packets {
@@ -540,7 +540,7 @@ func TestParseMediumAckHandleOnlyBatch(t *testing.T) {
// TestParseMediumAckHandleOnlyVerifyValues tests each 3-stmt AckHandle-only
// packet individually, verifying that the AckHandle field is correctly populated.
func TestParseMediumAckHandleOnlyVerifyValues(t *testing.T) {
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
ack := uint32(0xCAFEBABE)
makeFrame := func() *byteframe.ByteFrame {
@@ -739,7 +739,7 @@ func TestParseMediumDeleteUser(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysDeleteUser{}
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
if err == nil {
t.Fatal("Parse() should return error for NOT IMPLEMENTED")
}
@@ -756,7 +756,7 @@ func TestParseMediumInsertUser(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysInsertUser{}
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
if err == nil {
t.Fatal("Parse() should return error for NOT IMPLEMENTED")
}

12
network/mhfpacket/msg_parse_small_test.go
View File

@@ -5,7 +5,7 @@ import (
"testing"
"erupe-ce/common/byteframe"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network/clientctx"
)
@@ -60,7 +60,7 @@ func TestParseSmallNotImplemented(t *testing.T) {
{"MsgSysTransBinary", &MsgSysTransBinary{}},
}
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
for _, tc := range packets {
t.Run(tc.name, func(t *testing.T) {
bf := byteframe.NewByteFrame()
@@ -89,7 +89,7 @@ func TestParseSmallNoData(t *testing.T) {
{"MsgSysUnreserveStage", &MsgSysUnreserveStage{}},
}
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
for _, tc := range packets {
t.Run(tc.name, func(t *testing.T) {
bf := byteframe.NewByteFrame()
@@ -112,7 +112,7 @@ func TestParseSmallLogout(t *testing.T) {
{"max", 255},
}
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
bf := byteframe.NewByteFrame()
@@ -134,7 +134,7 @@ func TestParseSmallLogout(t *testing.T) {
// TestParseSmallEnumerateHouse tests Parse for MsgMhfEnumerateHouse which reads
// AckHandle, CharID, Method, Unk, lenName, and optional Name.
func TestParseSmallEnumerateHouse(t *testing.T) {
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
t.Run("no name", func(t *testing.T) {
bf := byteframe.NewByteFrame()
@@ -205,7 +205,7 @@ func TestParseSmallNotImplementedDoesNotPanic(t *testing.T) {
&MsgSysSerialize{},
}
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
for _, pkt := range packets {
t.Run("not_implemented", func(t *testing.T) {
bf := byteframe.NewByteFrame()

16
network/mhfpacket/msg_parse_test.go
View File

@@ -5,7 +5,7 @@ import (
"testing"
"erupe-ce/common/byteframe"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network/clientctx"
)
@@ -18,7 +18,7 @@ func TestMsgMhfGetAchievementDetailedParse(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfGetAchievement{}
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
if err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -40,7 +40,7 @@ func TestMsgMhfAddAchievementDetailedParse(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfAddAchievement{}
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
if err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -82,7 +82,7 @@ func TestMsgSysCastBinaryDetailedParse(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysCastBinary{}
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
if err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -120,7 +120,7 @@ func TestMsgSysLogoutDetailedParse(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysLogout{}
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
if err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -148,7 +148,7 @@ func TestMsgSysBackStageDetailedParse(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysBackStage{}
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
if err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -175,7 +175,7 @@ func TestMsgSysPingDetailedParse(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysPing{}
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
if err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -204,7 +204,7 @@ func TestMsgSysTimeDetailedParse(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysTime{}
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
if err != nil {
t.Fatalf("Parse() error = %v", err)
}

16
network/mhfpacket/msg_sys_core_test.go
View File

@@ -5,7 +5,7 @@ import (
"testing"
"erupe-ce/common/byteframe"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network"
"erupe-ce/network/clientctx"
)
@@ -56,7 +56,7 @@ func TestMsgSysAckRoundTrip(t *testing.T) {
ErrorCode: tt.errorCode,
AckData: tt.ackData,
}
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
// Build
bf := byteframe.NewByteFrame()
@@ -100,7 +100,7 @@ func TestMsgSysAckLargePayload(t *testing.T) {
ErrorCode: 0,
AckData: largeData,
}
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
// Build
bf := byteframe.NewByteFrame()
@@ -131,7 +131,7 @@ func TestMsgSysAckOpcode(t *testing.T) {
func TestMsgSysNopRoundTrip(t *testing.T) {
original := &MsgSysNop{}
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
// Build
bf := byteframe.NewByteFrame()
@@ -162,7 +162,7 @@ func TestMsgSysNopOpcode(t *testing.T) {
func TestMsgSysEndRoundTrip(t *testing.T) {
original := &MsgSysEnd{}
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
// Build
bf := byteframe.NewByteFrame()
@@ -199,7 +199,7 @@ func TestMsgSysAckNonBufferResponse(t *testing.T) {
ErrorCode: 0,
AckData: []byte{0xAA, 0xBB, 0xCC, 0xDD},
}
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
bf := byteframe.NewByteFrame()
err := original.Build(bf, ctx)
@@ -228,7 +228,7 @@ func TestMsgSysAckNonBufferShortData(t *testing.T) {
ErrorCode: 0,
AckData: []byte{0x01}, // Only 1 byte
}
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
bf := byteframe.NewByteFrame()
err := original.Build(bf, ctx)
@@ -256,7 +256,7 @@ func TestMsgSysAckBuildFormat(t *testing.T) {
ErrorCode: 0x55,
AckData: []byte{0xAA, 0xBB},
}
ctx := &clientctx.ClientContext{RealClientMode: _config.ZZ}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
bf := byteframe.NewByteFrame()
_ = pkt.Build(bf, ctx)

4
network/mhfpacket/msg_sys_create_acquire_semaphore.go
View File

@@ -3,7 +3,7 @@ package mhfpacket
import (
"errors"
"erupe-ce/common/byteframe"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network"
"erupe-ce/network/clientctx"
)
@@ -25,7 +25,7 @@ func (m *MsgSysCreateAcquireSemaphore) Opcode() network.PacketID {
func (m *MsgSysCreateAcquireSemaphore) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
m.AckHandle = bf.ReadUint32()
m.Unk0 = bf.ReadUint16()
if ctx.RealClientMode >= _config.S7 { // Assuming this was added with Ravi?
if ctx.RealClientMode >= cfg.S7 { // Assuming this was added with Ravi?
m.PlayerCount = bf.ReadUint8()
}
bf.ReadUint8() // SemaphoreID length

4
network/mhfpacket/msg_sys_create_semaphore.go
View File

@@ -2,7 +2,7 @@ package mhfpacket
import (
"errors"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/common/byteframe"
"erupe-ce/network"
@@ -26,7 +26,7 @@ func (m *MsgSysCreateSemaphore) Opcode() network.PacketID {
func (m *MsgSysCreateSemaphore) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
m.AckHandle = bf.ReadUint32()
m.Unk0 = bf.ReadUint16()
if ctx.RealClientMode >= _config.S7 { // Assuming this was added with Ravi?
if ctx.RealClientMode >= cfg.S7 { // Assuming this was added with Ravi?
m.PlayerCount = bf.ReadUint8()
}
bf.ReadUint8() // SemaphoreID length

4
network/mhfpacket/msg_sys_packets_test.go
View File

@@ -5,7 +5,7 @@ import (
"testing"
"erupe-ce/common/byteframe"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network"
"erupe-ce/network/clientctx"
)
@@ -35,7 +35,7 @@ func TestMsgSysCastBinaryParse(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysCastBinary{}
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
if err != nil {
t.Fatalf("Parse() error = %v", err)
}

18
network/mhfpacket/msg_sys_stage_test.go
View File

@@ -5,7 +5,7 @@ import (
"testing"
"erupe-ce/common/byteframe"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/network"
"erupe-ce/network/clientctx"
)
@@ -59,7 +59,7 @@ func TestMsgSysCreateStageFields(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysCreateStage{}
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
if err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -103,7 +103,7 @@ func TestMsgSysEnterStageFields(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysEnterStage{}
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
if err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -143,7 +143,7 @@ func TestMsgSysMoveStageFields(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysMoveStage{}
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
if err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -185,7 +185,7 @@ func TestMsgSysLockStageFields(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysLockStage{}
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
if err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -219,7 +219,7 @@ func TestMsgSysUnlockStageFields(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysUnlockStage{}
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
if err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -246,7 +246,7 @@ func TestMsgSysBackStageFields(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysBackStage{}
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
if err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -275,7 +275,7 @@ func TestStageIDEdgeCases(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysCreateStage{}
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
if err != nil {
t.Fatalf("Parse() error = %v", err)
}
@@ -297,7 +297,7 @@ func TestStageIDEdgeCases(t *testing.T) {
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysEnterStage{}
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: _config.ZZ})
err := pkt.Parse(bf, &clientctx.ClientContext{RealClientMode: cfg.ZZ})
if err != nil {
t.Fatalf("Parse() error = %v", err)
}

4
network/mhfpacket/msg_sys_terminal_log.go
View File

@@ -2,7 +2,7 @@ package mhfpacket
import (
"errors"
_config "erupe-ce/config"
cfg "erupe-ce/config"
"erupe-ce/common/byteframe"
"erupe-ce/network"
@@ -49,7 +49,7 @@ func (m *MsgSysTerminalLog) Parse(bf *byteframe.ByteFrame, ctx *clientctx.Client
e.Unk1 = bf.ReadInt32()
e.Unk2 = bf.ReadInt32()
e.Unk3 = bf.ReadInt32()
if ctx.RealClientMode >= _config.G1 {
if ctx.RealClientMode >= cfg.G1 {
for j := 0; j < 4; j++ {
e.Unk4 = append(e.Unk4, bf.ReadInt32())
}