diff --git a/.gitignore b/.gitignore index 5b569b1c2..76ec0c936 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,5 @@ savedata/*/ *.lnk *.bat /docker/db-data -screenshots/* \ No newline at end of file +screenshots/* +/docker/Servers \ No newline at end of file diff --git a/main.go b/main.go index 2c776a78c..0a179635f 100644 --- a/main.go +++ b/main.go @@ -15,6 +15,7 @@ import ( "erupe-ce/server/discordbot" "erupe-ce/server/entranceserver" "erupe-ce/server/signserver" + "erupe-ce/utils/gametime" "github.com/jmoiron/sqlx" _ "github.com/lib/pq" @@ -138,7 +139,7 @@ func main() { logger.Info("Database: Finished clearing") } - logger.Info(fmt.Sprintf("Server Time: %s", channelserver.TimeAdjusted().String())) + logger.Info(fmt.Sprintf("Server Time: %s", gametime.TimeAdjusted().String())) // Now start our server(s). diff --git a/network/binpacket/msg_bin_chat.go b/network/binpacket/msg_bin_chat.go index b39a43795..c8e761097 100644 --- a/network/binpacket/msg_bin_chat.go +++ b/network/binpacket/msg_bin_chat.go @@ -1,9 +1,9 @@ package binpacket import ( - "erupe-ce/common/byteframe" - "erupe-ce/common/stringsupport" "erupe-ce/network" + "erupe-ce/utils/byteframe" + "erupe-ce/utils/stringsupport" ) // ChatType represents the chat message type (Thanks to @Alice on discord for identifying these!) diff --git a/network/binpacket/msg_bin_mail_notify.go b/network/binpacket/msg_bin_mail_notify.go index 125dc57ef..096d72466 100644 --- a/network/binpacket/msg_bin_mail_notify.go +++ b/network/binpacket/msg_bin_mail_notify.go @@ -1,9 +1,9 @@ package binpacket import ( - "erupe-ce/common/byteframe" - "erupe-ce/common/stringsupport" "erupe-ce/network" + "erupe-ce/utils/byteframe" + "erupe-ce/utils/stringsupport" ) type MsgBinMailNotify struct { diff --git a/network/binpacket/msg_bin_targeted.go b/network/binpacket/msg_bin_targeted.go index 87bfb54ce..9566ab2ad 100644 --- a/network/binpacket/msg_bin_targeted.go +++ b/network/binpacket/msg_bin_targeted.go @@ -1,8 +1,8 @@ package binpacket import ( - "erupe-ce/common/byteframe" "erupe-ce/network" + "erupe-ce/utils/byteframe" ) // MsgBinTargeted is a format used for some broadcast types diff --git a/network/mhfpacket/mhfpacket.go b/network/mhfpacket/mhfpacket.go index 7bf8ad2c4..66d57d8e1 100644 --- a/network/mhfpacket/mhfpacket.go +++ b/network/mhfpacket/mhfpacket.go @@ -1,9 +1,9 @@ package mhfpacket import ( - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // Parser is the interface that wraps the Parse method. diff --git a/network/mhfpacket/msg_ca_exchange_item.go b/network/mhfpacket/msg_ca_exchange_item.go index feb201521..e6460a17c 100644 --- a/network/mhfpacket/msg_ca_exchange_item.go +++ b/network/mhfpacket/msg_ca_exchange_item.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgCaExchangeItem represents the MSG_CA_EXCHANGE_ITEM diff --git a/network/mhfpacket/msg_head.go b/network/mhfpacket/msg_head.go index 032088537..5df43ad94 100644 --- a/network/mhfpacket/msg_head.go +++ b/network/mhfpacket/msg_head.go @@ -6,7 +6,7 @@ import ( "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/utils/byteframe" ) // MsgHead represents the MSG_HEAD diff --git a/network/mhfpacket/msg_mhf_accept_read_reward.go b/network/mhfpacket/msg_mhf_accept_read_reward.go index 7c3b7919a..f6eb99009 100644 --- a/network/mhfpacket/msg_mhf_accept_read_reward.go +++ b/network/mhfpacket/msg_mhf_accept_read_reward.go @@ -6,7 +6,7 @@ import ( "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/utils/byteframe" ) // MsgMhfAcceptReadReward represents the MSG_MHF_ACCEPT_READ_REWARD diff --git a/network/mhfpacket/msg_mhf_acquire_cafe_item.go b/network/mhfpacket/msg_mhf_acquire_cafe_item.go index 04e603a44..5e60aba76 100644 --- a/network/mhfpacket/msg_mhf_acquire_cafe_item.go +++ b/network/mhfpacket/msg_mhf_acquire_cafe_item.go @@ -4,9 +4,9 @@ import ( "errors" _config "erupe-ce/config" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfAcquireCafeItem represents the MSG_MHF_ACQUIRE_CAFE_ITEM diff --git a/network/mhfpacket/msg_mhf_acquire_dist_item.go b/network/mhfpacket/msg_mhf_acquire_dist_item.go index a11bf3ba4..2e4abb209 100644 --- a/network/mhfpacket/msg_mhf_acquire_dist_item.go +++ b/network/mhfpacket/msg_mhf_acquire_dist_item.go @@ -5,14 +5,14 @@ import ( "erupe-ce/network" "erupe-ce/network/clientctx" - "erupe-ce/common/byteframe" + "erupe-ce/utils/byteframe" ) // MsgMhfAcquireDistItem represents the MSG_MHF_ACQUIRE_DIST_ITEM type MsgMhfAcquireDistItem struct { - AckHandle uint32 + AckHandle uint32 DistributionType uint8 - DistributionID uint32 + DistributionID uint32 } // Opcode returns the ID associated with this packet type. diff --git a/network/mhfpacket/msg_mhf_acquire_exchange_shop.go b/network/mhfpacket/msg_mhf_acquire_exchange_shop.go index 3131cc2bb..a31411741 100644 --- a/network/mhfpacket/msg_mhf_acquire_exchange_shop.go +++ b/network/mhfpacket/msg_mhf_acquire_exchange_shop.go @@ -3,7 +3,7 @@ package mhfpacket import ( "erupe-ce/network" "erupe-ce/network/clientctx" - "erupe-ce/common/byteframe" + "erupe-ce/utils/byteframe" ) // MsgMhfAcquireExchangeShop represents the MSG_MHF_ACQUIRE_EXCHANGE_SHOP diff --git a/network/mhfpacket/msg_mhf_acquire_festa.go b/network/mhfpacket/msg_mhf_acquire_festa.go index 87cf758f0..5280f2dcd 100644 --- a/network/mhfpacket/msg_mhf_acquire_festa.go +++ b/network/mhfpacket/msg_mhf_acquire_festa.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfAcquireFesta represents the MSG_MHF_ACQUIRE_FESTA diff --git a/network/mhfpacket/msg_mhf_acquire_festa_intermediate_prize.go b/network/mhfpacket/msg_mhf_acquire_festa_intermediate_prize.go index a5a07e662..60e5bc6ac 100644 --- a/network/mhfpacket/msg_mhf_acquire_festa_intermediate_prize.go +++ b/network/mhfpacket/msg_mhf_acquire_festa_intermediate_prize.go @@ -5,13 +5,13 @@ import ( "erupe-ce/network" "erupe-ce/network/clientctx" - "erupe-ce/common/byteframe" + "erupe-ce/utils/byteframe" ) // MsgMhfAcquireFestaIntermediatePrize represents the MSG_MHF_ACQUIRE_FESTA_INTERMEDIATE_PRIZE type MsgMhfAcquireFestaIntermediatePrize struct { AckHandle uint32 - PrizeID uint32 + PrizeID uint32 } // Opcode returns the ID associated with this packet type. @@ -22,7 +22,7 @@ func (m *MsgMhfAcquireFestaIntermediatePrize) Opcode() network.PacketID { // Parse parses the packet from binary func (m *MsgMhfAcquireFestaIntermediatePrize) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error { m.AckHandle = bf.ReadUint32() - m.PrizeID = bf.ReadUint32() + m.PrizeID = bf.ReadUint32() return nil } diff --git a/network/mhfpacket/msg_mhf_acquire_festa_personal_prize.go b/network/mhfpacket/msg_mhf_acquire_festa_personal_prize.go index 61abeec1b..4cfc83dd9 100644 --- a/network/mhfpacket/msg_mhf_acquire_festa_personal_prize.go +++ b/network/mhfpacket/msg_mhf_acquire_festa_personal_prize.go @@ -1,17 +1,17 @@ package mhfpacket import ( - "errors" + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfAcquireFestaPersonalPrize represents the MSG_MHF_ACQUIRE_FESTA_PERSONAL_PRIZE type MsgMhfAcquireFestaPersonalPrize struct { - AckHandle uint32 - PrizeID uint32 + AckHandle uint32 + PrizeID uint32 } // Opcode returns the ID associated with this packet type. @@ -21,9 +21,9 @@ func (m *MsgMhfAcquireFestaPersonalPrize) Opcode() network.PacketID { // Parse parses the packet from binary func (m *MsgMhfAcquireFestaPersonalPrize) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error { - m.AckHandle = bf.ReadUint32() - m.PrizeID = bf.ReadUint32() - return nil + m.AckHandle = bf.ReadUint32() + m.PrizeID = bf.ReadUint32() + return nil } // Build builds a binary packet from the current data. diff --git a/network/mhfpacket/msg_mhf_acquire_guild_adventure.go b/network/mhfpacket/msg_mhf_acquire_guild_adventure.go index 301783691..171ec6d6c 100644 --- a/network/mhfpacket/msg_mhf_acquire_guild_adventure.go +++ b/network/mhfpacket/msg_mhf_acquire_guild_adventure.go @@ -1,17 +1,17 @@ package mhfpacket import ( - "errors" + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfAcquireGuildAdventure represents the MSG_MHF_ACQUIRE_GUILD_ADVENTURE type MsgMhfAcquireGuildAdventure struct { - AckHandle uint32 - ID uint32 + AckHandle uint32 + ID uint32 } // Opcode returns the ID associated with this packet type. @@ -21,9 +21,9 @@ func (m *MsgMhfAcquireGuildAdventure) Opcode() network.PacketID { // Parse parses the packet from binary func (m *MsgMhfAcquireGuildAdventure) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error { - m.AckHandle = bf.ReadUint32() - m.ID = bf.ReadUint32() - return nil + m.AckHandle = bf.ReadUint32() + m.ID = bf.ReadUint32() + return nil } // Build builds a binary packet from the current data. diff --git a/network/mhfpacket/msg_mhf_acquire_guild_tresure.go b/network/mhfpacket/msg_mhf_acquire_guild_tresure.go index ac9feb557..0260c2bd5 100644 --- a/network/mhfpacket/msg_mhf_acquire_guild_tresure.go +++ b/network/mhfpacket/msg_mhf_acquire_guild_tresure.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfAcquireGuildTresure represents the MSG_MHF_ACQUIRE_GUILD_TRESURE diff --git a/network/mhfpacket/msg_mhf_acquire_guild_tresure_souvenir.go b/network/mhfpacket/msg_mhf_acquire_guild_tresure_souvenir.go index be061add3..09e162cf3 100644 --- a/network/mhfpacket/msg_mhf_acquire_guild_tresure_souvenir.go +++ b/network/mhfpacket/msg_mhf_acquire_guild_tresure_souvenir.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfAcquireGuildTresureSouvenir represents the MSG_MHF_ACQUIRE_GUILD_TRESURE_SOUVENIR diff --git a/network/mhfpacket/msg_mhf_acquire_item.go b/network/mhfpacket/msg_mhf_acquire_item.go index de86ce846..1b3263447 100644 --- a/network/mhfpacket/msg_mhf_acquire_item.go +++ b/network/mhfpacket/msg_mhf_acquire_item.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfAcquireItem represents the MSG_MHF_ACQUIRE_ITEM diff --git a/network/mhfpacket/msg_mhf_acquire_monthly_item.go b/network/mhfpacket/msg_mhf_acquire_monthly_item.go index d64288f9f..e6847091c 100644 --- a/network/mhfpacket/msg_mhf_acquire_monthly_item.go +++ b/network/mhfpacket/msg_mhf_acquire_monthly_item.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfAcquireMonthlyItem represents the MSG_MHF_ACQUIRE_MONTHLY_ITEM diff --git a/network/mhfpacket/msg_mhf_acquire_monthly_reward.go b/network/mhfpacket/msg_mhf_acquire_monthly_reward.go index d3c0f6820..33ddc6349 100644 --- a/network/mhfpacket/msg_mhf_acquire_monthly_reward.go +++ b/network/mhfpacket/msg_mhf_acquire_monthly_reward.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfAcquireMonthlyReward represents the MSG_MHF_ACQUIRE_MONTHLY_REWARD diff --git a/network/mhfpacket/msg_mhf_acquire_title.go b/network/mhfpacket/msg_mhf_acquire_title.go index 9b9dd84dc..b724d5297 100644 --- a/network/mhfpacket/msg_mhf_acquire_title.go +++ b/network/mhfpacket/msg_mhf_acquire_title.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfAcquireTitle represents the MSG_MHF_ACQUIRE_TITLE diff --git a/network/mhfpacket/msg_mhf_acquire_tournament.go b/network/mhfpacket/msg_mhf_acquire_tournament.go index 2e65e0984..b2246807a 100644 --- a/network/mhfpacket/msg_mhf_acquire_tournament.go +++ b/network/mhfpacket/msg_mhf_acquire_tournament.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfAcquireTournament represents the MSG_MHF_ACQUIRE_TOURNAMENT diff --git a/network/mhfpacket/msg_mhf_acquire_ud_item.go b/network/mhfpacket/msg_mhf_acquire_ud_item.go index 4cb8d11b7..245e4693b 100644 --- a/network/mhfpacket/msg_mhf_acquire_ud_item.go +++ b/network/mhfpacket/msg_mhf_acquire_ud_item.go @@ -1,30 +1,30 @@ package mhfpacket import ( - "errors" + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfAcquireUdItem represents the MSG_MHF_ACQUIRE_UD_ITEM type MsgMhfAcquireUdItem struct { - AckHandle uint32 - Unk0 uint8 - // from gal - // daily = 0 - // personal = 1 - // personal rank = 2 - // guild rank = 3 - // gcp = 4 - // from cat - // treasure achievement = 5 - // personal achievement = 6 - // guild achievement = 7 - RewardType uint8 - Unk2 uint8 // Number of uint32s to read? - Unk3 []byte + AckHandle uint32 + Unk0 uint8 + // from gal + // daily = 0 + // personal = 1 + // personal rank = 2 + // guild rank = 3 + // gcp = 4 + // from cat + // treasure achievement = 5 + // personal achievement = 6 + // guild achievement = 7 + RewardType uint8 + Unk2 uint8 // Number of uint32s to read? + Unk3 []byte } // Opcode returns the ID associated with this packet type. @@ -34,13 +34,13 @@ func (m *MsgMhfAcquireUdItem) Opcode() network.PacketID { // Parse parses the packet from binary func (m *MsgMhfAcquireUdItem) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error { - m.AckHandle = bf.ReadUint32() + m.AckHandle = bf.ReadUint32() m.Unk0 = bf.ReadUint8() m.RewardType = bf.ReadUint8() - m.Unk2 = bf.ReadUint8() - for i := uint8(0); i < m.Unk2; i++ { - bf.ReadUint32() - } + m.Unk2 = bf.ReadUint8() + for i := uint8(0); i < m.Unk2; i++ { + bf.ReadUint32() + } return nil } diff --git a/network/mhfpacket/msg_mhf_add_achievement.go b/network/mhfpacket/msg_mhf_add_achievement.go index c127c3437..3d4ffeb0c 100644 --- a/network/mhfpacket/msg_mhf_add_achievement.go +++ b/network/mhfpacket/msg_mhf_add_achievement.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfAddAchievement represents the MSG_MHF_ADD_ACHIEVEMENT diff --git a/network/mhfpacket/msg_mhf_add_guild_mission_count.go b/network/mhfpacket/msg_mhf_add_guild_mission_count.go index 86ea70b86..eeb24778f 100644 --- a/network/mhfpacket/msg_mhf_add_guild_mission_count.go +++ b/network/mhfpacket/msg_mhf_add_guild_mission_count.go @@ -1,18 +1,18 @@ package mhfpacket import ( - "errors" + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfAddGuildMissionCount represents the MSG_MHF_ADD_GUILD_MISSION_COUNT type MsgMhfAddGuildMissionCount struct { - AckHandle uint32 - MissionID uint32 - Count uint32 + AckHandle uint32 + MissionID uint32 + Count uint32 } // Opcode returns the ID associated with this packet type. @@ -22,10 +22,10 @@ func (m *MsgMhfAddGuildMissionCount) Opcode() network.PacketID { // Parse parses the packet from binary func (m *MsgMhfAddGuildMissionCount) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error { - m.AckHandle = bf.ReadUint32() - m.MissionID = bf.ReadUint32() - m.Count = bf.ReadUint32() - return nil + m.AckHandle = bf.ReadUint32() + m.MissionID = bf.ReadUint32() + m.Count = bf.ReadUint32() + return nil } // Build builds a binary packet from the current data. diff --git a/network/mhfpacket/msg_mhf_add_guild_weekly_bonus_exceptional_user.go b/network/mhfpacket/msg_mhf_add_guild_weekly_bonus_exceptional_user.go index ec6b72f39..0bd4549b7 100644 --- a/network/mhfpacket/msg_mhf_add_guild_weekly_bonus_exceptional_user.go +++ b/network/mhfpacket/msg_mhf_add_guild_weekly_bonus_exceptional_user.go @@ -1,17 +1,17 @@ package mhfpacket import ( - "errors" + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfAddGuildWeeklyBonusExceptionalUser represents the MSG_MHF_ADD_GUILD_WEEKLY_BONUS_EXCEPTIONAL_USER type MsgMhfAddGuildWeeklyBonusExceptionalUser struct { - AckHandle uint32 - NumUsers uint8 + AckHandle uint32 + NumUsers uint8 } // Opcode returns the ID associated with this packet type. @@ -21,9 +21,9 @@ func (m *MsgMhfAddGuildWeeklyBonusExceptionalUser) Opcode() network.PacketID { // Parse parses the packet from binary func (m *MsgMhfAddGuildWeeklyBonusExceptionalUser) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error { - m.AckHandle = bf.ReadUint32() - m.NumUsers = bf.ReadUint8() - return nil + m.AckHandle = bf.ReadUint32() + m.NumUsers = bf.ReadUint8() + return nil } // Build builds a binary packet from the current data. diff --git a/network/mhfpacket/msg_mhf_add_kouryou_point.go b/network/mhfpacket/msg_mhf_add_kouryou_point.go index 8fb96319a..57f0f2ef3 100644 --- a/network/mhfpacket/msg_mhf_add_kouryou_point.go +++ b/network/mhfpacket/msg_mhf_add_kouryou_point.go @@ -3,7 +3,7 @@ package mhfpacket import ( "erupe-ce/network" "erupe-ce/network/clientctx" - "erupe-ce/common/byteframe" + "erupe-ce/utils/byteframe" ) // MsgMhfAddKouryouPoint represents the MSG_MHF_ADD_KOURYOU_POINT diff --git a/network/mhfpacket/msg_mhf_add_reward_song_count.go b/network/mhfpacket/msg_mhf_add_reward_song_count.go index 4a0192845..62bf80f7b 100644 --- a/network/mhfpacket/msg_mhf_add_reward_song_count.go +++ b/network/mhfpacket/msg_mhf_add_reward_song_count.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfAddRewardSongCount represents the MSG_MHF_ADD_REWARD_SONG_COUNT diff --git a/network/mhfpacket/msg_mhf_add_ud_point.go b/network/mhfpacket/msg_mhf_add_ud_point.go index 3ccefa9ec..769e3b078 100644 --- a/network/mhfpacket/msg_mhf_add_ud_point.go +++ b/network/mhfpacket/msg_mhf_add_ud_point.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfAddUdPoint represents the MSG_MHF_ADD_UD_POINT diff --git a/network/mhfpacket/msg_mhf_add_ud_tactics_point.go b/network/mhfpacket/msg_mhf_add_ud_tactics_point.go index d9f818366..b6425cf51 100644 --- a/network/mhfpacket/msg_mhf_add_ud_tactics_point.go +++ b/network/mhfpacket/msg_mhf_add_ud_tactics_point.go @@ -3,7 +3,7 @@ package mhfpacket import ( "erupe-ce/network" "erupe-ce/network/clientctx" - "erupe-ce/common/byteframe" + "erupe-ce/utils/byteframe" ) // MsgMhfAddUdTacticsPoint represents the MSG_MHF_ADD_UD_TACTICS_POINT diff --git a/network/mhfpacket/msg_mhf_announce.go b/network/mhfpacket/msg_mhf_announce.go index 2b1d9ea76..e32580013 100644 --- a/network/mhfpacket/msg_mhf_announce.go +++ b/network/mhfpacket/msg_mhf_announce.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfAnnounce represents the MSG_MHF_ANNOUNCE diff --git a/network/mhfpacket/msg_mhf_answer_guild_scout.go b/network/mhfpacket/msg_mhf_answer_guild_scout.go index f80894f97..5edaad650 100644 --- a/network/mhfpacket/msg_mhf_answer_guild_scout.go +++ b/network/mhfpacket/msg_mhf_answer_guild_scout.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfAnswerGuildScout represents the MSG_MHF_ANSWER_GUILD_SCOUT diff --git a/network/mhfpacket/msg_mhf_apply_bbs_article.go b/network/mhfpacket/msg_mhf_apply_bbs_article.go index d2b9c803b..378cc2926 100644 --- a/network/mhfpacket/msg_mhf_apply_bbs_article.go +++ b/network/mhfpacket/msg_mhf_apply_bbs_article.go @@ -2,12 +2,12 @@ package mhfpacket import ( "errors" - "erupe-ce/common/bfutil" - "erupe-ce/common/stringsupport" + "erupe-ce/utils/bfutil" + "erupe-ce/utils/stringsupport" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfApplyBbsArticle represents the MSG_MHF_APPLY_BBS_ARTICLE diff --git a/network/mhfpacket/msg_mhf_apply_campaign.go b/network/mhfpacket/msg_mhf_apply_campaign.go index b39dab499..2ab2639d3 100644 --- a/network/mhfpacket/msg_mhf_apply_campaign.go +++ b/network/mhfpacket/msg_mhf_apply_campaign.go @@ -2,9 +2,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfApplyCampaign represents the MSG_MHF_APPLY_CAMPAIGN diff --git a/network/mhfpacket/msg_mhf_apply_dist_item.go b/network/mhfpacket/msg_mhf_apply_dist_item.go index a68354d2b..3c99dbb15 100644 --- a/network/mhfpacket/msg_mhf_apply_dist_item.go +++ b/network/mhfpacket/msg_mhf_apply_dist_item.go @@ -2,10 +2,10 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" _config "erupe-ce/config" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfApplyDistItem represents the MSG_MHF_APPLY_DIST_ITEM diff --git a/network/mhfpacket/msg_mhf_arrange_guild_member.go b/network/mhfpacket/msg_mhf_arrange_guild_member.go index 066735a10..b565fe247 100644 --- a/network/mhfpacket/msg_mhf_arrange_guild_member.go +++ b/network/mhfpacket/msg_mhf_arrange_guild_member.go @@ -2,9 +2,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfArrangeGuildMember represents the MSG_MHF_ARRANGE_GUILD_MEMBER diff --git a/network/mhfpacket/msg_mhf_cancel_guild_mission_target.go b/network/mhfpacket/msg_mhf_cancel_guild_mission_target.go index c6eaf00c6..7b7f6c9d0 100644 --- a/network/mhfpacket/msg_mhf_cancel_guild_mission_target.go +++ b/network/mhfpacket/msg_mhf_cancel_guild_mission_target.go @@ -1,17 +1,17 @@ package mhfpacket import ( - "errors" + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfCancelGuildMissionTarget represents the MSG_MHF_CANCEL_GUILD_MISSION_TARGET type MsgMhfCancelGuildMissionTarget struct { - AckHandle uint32 - MissionID uint32 + AckHandle uint32 + MissionID uint32 } // Opcode returns the ID associated with this packet type. @@ -21,9 +21,9 @@ func (m *MsgMhfCancelGuildMissionTarget) Opcode() network.PacketID { // Parse parses the packet from binary func (m *MsgMhfCancelGuildMissionTarget) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error { - m.AckHandle = bf.ReadUint32() - m.MissionID = bf.ReadUint32() - return nil + m.AckHandle = bf.ReadUint32() + m.MissionID = bf.ReadUint32() + return nil } // Build builds a binary packet from the current data. diff --git a/network/mhfpacket/msg_mhf_cancel_guild_scout.go b/network/mhfpacket/msg_mhf_cancel_guild_scout.go index fa3eabd16..4c354601b 100644 --- a/network/mhfpacket/msg_mhf_cancel_guild_scout.go +++ b/network/mhfpacket/msg_mhf_cancel_guild_scout.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfCancelGuildScout represents the MSG_MHF_CANCEL_GUILD_SCOUT diff --git a/network/mhfpacket/msg_mhf_caravan_my_rank.go b/network/mhfpacket/msg_mhf_caravan_my_rank.go index d3e261caa..2f4b0dec0 100644 --- a/network/mhfpacket/msg_mhf_caravan_my_rank.go +++ b/network/mhfpacket/msg_mhf_caravan_my_rank.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfCaravanMyRank represents the MSG_MHF_CARAVAN_MY_RANK diff --git a/network/mhfpacket/msg_mhf_caravan_my_score.go b/network/mhfpacket/msg_mhf_caravan_my_score.go index dfa2333b4..34e089d24 100644 --- a/network/mhfpacket/msg_mhf_caravan_my_score.go +++ b/network/mhfpacket/msg_mhf_caravan_my_score.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfCaravanMyScore represents the MSG_MHF_CARAVAN_MY_SCORE diff --git a/network/mhfpacket/msg_mhf_caravan_ranking.go b/network/mhfpacket/msg_mhf_caravan_ranking.go index 1f86771af..5465e1627 100644 --- a/network/mhfpacket/msg_mhf_caravan_ranking.go +++ b/network/mhfpacket/msg_mhf_caravan_ranking.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfCaravanRanking represents the MSG_MHF_CARAVAN_RANKING diff --git a/network/mhfpacket/msg_mhf_charge_festa.go b/network/mhfpacket/msg_mhf_charge_festa.go index 145c2a3a7..926c9866d 100644 --- a/network/mhfpacket/msg_mhf_charge_festa.go +++ b/network/mhfpacket/msg_mhf_charge_festa.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfChargeFesta represents the MSG_MHF_CHARGE_FESTA diff --git a/network/mhfpacket/msg_mhf_charge_guild_adventure.go b/network/mhfpacket/msg_mhf_charge_guild_adventure.go index faa86b570..2f13909c8 100644 --- a/network/mhfpacket/msg_mhf_charge_guild_adventure.go +++ b/network/mhfpacket/msg_mhf_charge_guild_adventure.go @@ -1,18 +1,18 @@ package mhfpacket import ( - "errors" + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfChargeGuildAdventure represents the MSG_MHF_CHARGE_GUILD_ADVENTURE type MsgMhfChargeGuildAdventure struct { - AckHandle uint32 - ID uint32 - Amount uint32 + AckHandle uint32 + ID uint32 + Amount uint32 } // Opcode returns the ID associated with this packet type. @@ -22,10 +22,10 @@ func (m *MsgMhfChargeGuildAdventure) Opcode() network.PacketID { // Parse parses the packet from binary func (m *MsgMhfChargeGuildAdventure) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error { - m.AckHandle = bf.ReadUint32() - m.ID = bf.ReadUint32() - m.Amount = bf.ReadUint32() - return nil + m.AckHandle = bf.ReadUint32() + m.ID = bf.ReadUint32() + m.Amount = bf.ReadUint32() + return nil } // Build builds a binary packet from the current data. diff --git a/network/mhfpacket/msg_mhf_check_daily_cafepoint.go b/network/mhfpacket/msg_mhf_check_daily_cafepoint.go index fee1ec222..9cd66c905 100644 --- a/network/mhfpacket/msg_mhf_check_daily_cafepoint.go +++ b/network/mhfpacket/msg_mhf_check_daily_cafepoint.go @@ -2,9 +2,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfCheckDailyCafepoint represents the MSG_MHF_CHECK_DAILY_CAFEPOINT diff --git a/network/mhfpacket/msg_mhf_check_monthly_item.go b/network/mhfpacket/msg_mhf_check_monthly_item.go index 257e0f855..29916bbf8 100644 --- a/network/mhfpacket/msg_mhf_check_monthly_item.go +++ b/network/mhfpacket/msg_mhf_check_monthly_item.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfCheckMonthlyItem represents the MSG_MHF_CHECK_MONTHLY_ITEM diff --git a/network/mhfpacket/msg_mhf_check_weekly_stamp.go b/network/mhfpacket/msg_mhf_check_weekly_stamp.go index 069a17456..5afab1e3e 100644 --- a/network/mhfpacket/msg_mhf_check_weekly_stamp.go +++ b/network/mhfpacket/msg_mhf_check_weekly_stamp.go @@ -2,9 +2,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfCheckWeeklyStamp represents the MSG_MHF_CHECK_WEEKLY_STAMP diff --git a/network/mhfpacket/msg_mhf_contract_mercenary.go b/network/mhfpacket/msg_mhf_contract_mercenary.go index 1dad97253..9a2e52daf 100644 --- a/network/mhfpacket/msg_mhf_contract_mercenary.go +++ b/network/mhfpacket/msg_mhf_contract_mercenary.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfContractMercenary represents the MSG_MHF_CONTRACT_MERCENARY diff --git a/network/mhfpacket/msg_mhf_create_guild.go b/network/mhfpacket/msg_mhf_create_guild.go index e82f7157e..15d5d166c 100644 --- a/network/mhfpacket/msg_mhf_create_guild.go +++ b/network/mhfpacket/msg_mhf_create_guild.go @@ -3,10 +3,10 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" - "erupe-ce/common/stringsupport" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" + "erupe-ce/utils/stringsupport" ) // MsgMhfCreateGuild represents the MSG_MHF_CREATE_GUILD diff --git a/network/mhfpacket/msg_mhf_create_joint.go b/network/mhfpacket/msg_mhf_create_joint.go index 5a9a9f5fd..bfad13e92 100644 --- a/network/mhfpacket/msg_mhf_create_joint.go +++ b/network/mhfpacket/msg_mhf_create_joint.go @@ -3,10 +3,10 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" - "erupe-ce/common/stringsupport" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" + "erupe-ce/utils/stringsupport" ) // MsgMhfCreateJoint represents the MSG_MHF_CREATE_JOINT diff --git a/network/mhfpacket/msg_mhf_create_mercenary.go b/network/mhfpacket/msg_mhf_create_mercenary.go index ed0077886..d9312e6fd 100644 --- a/network/mhfpacket/msg_mhf_create_mercenary.go +++ b/network/mhfpacket/msg_mhf_create_mercenary.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfCreateMercenary represents the MSG_MHF_CREATE_MERCENARY diff --git a/network/mhfpacket/msg_mhf_debug_post_value.go b/network/mhfpacket/msg_mhf_debug_post_value.go index d982bcec9..b6823177b 100644 --- a/network/mhfpacket/msg_mhf_debug_post_value.go +++ b/network/mhfpacket/msg_mhf_debug_post_value.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfDebugPostValue represents the MSG_MHF_DEBUG_POST_VALUE diff --git a/network/mhfpacket/msg_mhf_displayed_achievement.go b/network/mhfpacket/msg_mhf_displayed_achievement.go index 2633c081e..5133689d8 100644 --- a/network/mhfpacket/msg_mhf_displayed_achievement.go +++ b/network/mhfpacket/msg_mhf_displayed_achievement.go @@ -2,9 +2,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfDisplayedAchievement represents the MSG_MHF_DISPLAYED_ACHIEVEMENT diff --git a/network/mhfpacket/msg_mhf_enter_tournament_quest.go b/network/mhfpacket/msg_mhf_enter_tournament_quest.go index 686de4afb..117032e0e 100644 --- a/network/mhfpacket/msg_mhf_enter_tournament_quest.go +++ b/network/mhfpacket/msg_mhf_enter_tournament_quest.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfEnterTournamentQuest represents the MSG_MHF_ENTER_TOURNAMENT_QUEST diff --git a/network/mhfpacket/msg_mhf_entry_festa.go b/network/mhfpacket/msg_mhf_entry_festa.go index de46b2d0e..0891693a2 100644 --- a/network/mhfpacket/msg_mhf_entry_festa.go +++ b/network/mhfpacket/msg_mhf_entry_festa.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfEntryFesta represents the MSG_MHF_ENTRY_FESTA diff --git a/network/mhfpacket/msg_mhf_entry_rookie_guild.go b/network/mhfpacket/msg_mhf_entry_rookie_guild.go index e3f12660f..3da316339 100644 --- a/network/mhfpacket/msg_mhf_entry_rookie_guild.go +++ b/network/mhfpacket/msg_mhf_entry_rookie_guild.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfEntryRookieGuild represents the MSG_MHF_ENTRY_ROOKIE_GUILD diff --git a/network/mhfpacket/msg_mhf_entry_tournament.go b/network/mhfpacket/msg_mhf_entry_tournament.go index 6f6550cf0..43a03ef3c 100644 --- a/network/mhfpacket/msg_mhf_entry_tournament.go +++ b/network/mhfpacket/msg_mhf_entry_tournament.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfEntryTournament represents the MSG_MHF_ENTRY_TOURNAMENT diff --git a/network/mhfpacket/msg_mhf_enumerate_airoulist.go b/network/mhfpacket/msg_mhf_enumerate_airoulist.go index 5af0d4c6d..3a2590b8f 100644 --- a/network/mhfpacket/msg_mhf_enumerate_airoulist.go +++ b/network/mhfpacket/msg_mhf_enumerate_airoulist.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfEnumerateAiroulist represents the MSG_MHF_ENUMERATE_AIROULIST diff --git a/network/mhfpacket/msg_mhf_enumerate_campaign.go b/network/mhfpacket/msg_mhf_enumerate_campaign.go index d06075077..dd932bcc9 100644 --- a/network/mhfpacket/msg_mhf_enumerate_campaign.go +++ b/network/mhfpacket/msg_mhf_enumerate_campaign.go @@ -1,9 +1,9 @@ package mhfpacket import ( - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfEnumerateCampaign represents the MSG_MHF_ENUMERATE_CAMPAIGN diff --git a/network/mhfpacket/msg_mhf_enumerate_dist_item.go b/network/mhfpacket/msg_mhf_enumerate_dist_item.go index d4164f1e5..87773ab9c 100644 --- a/network/mhfpacket/msg_mhf_enumerate_dist_item.go +++ b/network/mhfpacket/msg_mhf_enumerate_dist_item.go @@ -2,10 +2,10 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" _config "erupe-ce/config" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfEnumerateDistItem represents the MSG_MHF_ENUMERATE_DIST_ITEM diff --git a/network/mhfpacket/msg_mhf_enumerate_event.go b/network/mhfpacket/msg_mhf_enumerate_event.go index 6a863f92f..ff011a760 100644 --- a/network/mhfpacket/msg_mhf_enumerate_event.go +++ b/network/mhfpacket/msg_mhf_enumerate_event.go @@ -2,9 +2,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfEnumerateEvent represents the MSG_MHF_ENUMERATE_EVENT diff --git a/network/mhfpacket/msg_mhf_enumerate_festa_intermediate_prize.go b/network/mhfpacket/msg_mhf_enumerate_festa_intermediate_prize.go index 0c31688ca..b18144cf8 100644 --- a/network/mhfpacket/msg_mhf_enumerate_festa_intermediate_prize.go +++ b/network/mhfpacket/msg_mhf_enumerate_festa_intermediate_prize.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfEnumerateFestaIntermediatePrize represents the MSG_MHF_ENUMERATE_FESTA_INTERMEDIATE_PRIZE diff --git a/network/mhfpacket/msg_mhf_enumerate_festa_member.go b/network/mhfpacket/msg_mhf_enumerate_festa_member.go index 4b90589a9..ef069583b 100644 --- a/network/mhfpacket/msg_mhf_enumerate_festa_member.go +++ b/network/mhfpacket/msg_mhf_enumerate_festa_member.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfEnumerateFestaMember represents the MSG_MHF_ENUMERATE_FESTA_MEMBER diff --git a/network/mhfpacket/msg_mhf_enumerate_festa_personal_prize.go b/network/mhfpacket/msg_mhf_enumerate_festa_personal_prize.go index 2922256b4..45bd46e63 100644 --- a/network/mhfpacket/msg_mhf_enumerate_festa_personal_prize.go +++ b/network/mhfpacket/msg_mhf_enumerate_festa_personal_prize.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfEnumerateFestaPersonalPrize represents the MSG_MHF_ENUMERATE_FESTA_PERSONAL_PRIZE diff --git a/network/mhfpacket/msg_mhf_enumerate_guacot.go b/network/mhfpacket/msg_mhf_enumerate_guacot.go index 71cae7adf..805f9694d 100644 --- a/network/mhfpacket/msg_mhf_enumerate_guacot.go +++ b/network/mhfpacket/msg_mhf_enumerate_guacot.go @@ -2,9 +2,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfEnumerateGuacot represents the MSG_MHF_ENUMERATE_GUACOT diff --git a/network/mhfpacket/msg_mhf_enumerate_guild.go b/network/mhfpacket/msg_mhf_enumerate_guild.go index 61ead7870..684e8625f 100644 --- a/network/mhfpacket/msg_mhf_enumerate_guild.go +++ b/network/mhfpacket/msg_mhf_enumerate_guild.go @@ -2,9 +2,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) type EnumerateGuildType uint8 diff --git a/network/mhfpacket/msg_mhf_enumerate_guild_item.go b/network/mhfpacket/msg_mhf_enumerate_guild_item.go index 6d3516371..a868e8920 100644 --- a/network/mhfpacket/msg_mhf_enumerate_guild_item.go +++ b/network/mhfpacket/msg_mhf_enumerate_guild_item.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfEnumerateGuildItem represents the MSG_MHF_ENUMERATE_GUILD_ITEM diff --git a/network/mhfpacket/msg_mhf_enumerate_guild_member.go b/network/mhfpacket/msg_mhf_enumerate_guild_member.go index e90c431f2..1d433ec96 100644 --- a/network/mhfpacket/msg_mhf_enumerate_guild_member.go +++ b/network/mhfpacket/msg_mhf_enumerate_guild_member.go @@ -2,9 +2,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfEnumerateGuildMember represents the MSG_MHF_ENUMERATE_GUILD_MEMBER diff --git a/network/mhfpacket/msg_mhf_enumerate_guild_message_board.go b/network/mhfpacket/msg_mhf_enumerate_guild_message_board.go index 6e965340d..eb49fc553 100644 --- a/network/mhfpacket/msg_mhf_enumerate_guild_message_board.go +++ b/network/mhfpacket/msg_mhf_enumerate_guild_message_board.go @@ -1,20 +1,20 @@ package mhfpacket import ( - "errors" - - "erupe-ce/network/clientctx" + "errors" + "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfEnumerateGuildMessageBoard represents the MSG_MHF_ENUMERATE_GUILD_MESSAGE_BOARD -type MsgMhfEnumerateGuildMessageBoard struct{ - AckHandle uint32 - Unk0 uint32 - MaxPosts uint32 // always 100, even on news (00000064) - // returning more than 4 news posts WILL softlock - BoardType uint32 // 0 => message, 1 => news +type MsgMhfEnumerateGuildMessageBoard struct { + AckHandle uint32 + Unk0 uint32 + MaxPosts uint32 // always 100, even on news (00000064) + // returning more than 4 news posts WILL softlock + BoardType uint32 // 0 => message, 1 => news } // Opcode returns the ID associated with this packet type. @@ -24,10 +24,10 @@ func (m *MsgMhfEnumerateGuildMessageBoard) Opcode() network.PacketID { // Parse parses the packet from binary func (m *MsgMhfEnumerateGuildMessageBoard) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error { - m.AckHandle = bf.ReadUint32() - m.Unk0 = bf.ReadUint32() - m.MaxPosts = bf.ReadUint32() - m.BoardType = bf.ReadUint32() + m.AckHandle = bf.ReadUint32() + m.Unk0 = bf.ReadUint32() + m.MaxPosts = bf.ReadUint32() + m.BoardType = bf.ReadUint32() return nil } diff --git a/network/mhfpacket/msg_mhf_enumerate_guild_tresure.go b/network/mhfpacket/msg_mhf_enumerate_guild_tresure.go index f03202bd4..5423138fe 100644 --- a/network/mhfpacket/msg_mhf_enumerate_guild_tresure.go +++ b/network/mhfpacket/msg_mhf_enumerate_guild_tresure.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfEnumerateGuildTresure represents the MSG_MHF_ENUMERATE_GUILD_TRESURE diff --git a/network/mhfpacket/msg_mhf_enumerate_house.go b/network/mhfpacket/msg_mhf_enumerate_house.go index 41f57323a..fc217b4ec 100644 --- a/network/mhfpacket/msg_mhf_enumerate_house.go +++ b/network/mhfpacket/msg_mhf_enumerate_house.go @@ -2,11 +2,11 @@ package mhfpacket import ( "errors" - "erupe-ce/common/stringsupport" + "erupe-ce/utils/stringsupport" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfEnumerateHouse represents the MSG_MHF_ENUMERATE_HOUSE diff --git a/network/mhfpacket/msg_mhf_enumerate_inv_guild.go b/network/mhfpacket/msg_mhf_enumerate_inv_guild.go index 994c374d8..df13b9b1b 100644 --- a/network/mhfpacket/msg_mhf_enumerate_inv_guild.go +++ b/network/mhfpacket/msg_mhf_enumerate_inv_guild.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfEnumerateInvGuild represents the MSG_MHF_ENUMERATE_INV_GUILD diff --git a/network/mhfpacket/msg_mhf_enumerate_item.go b/network/mhfpacket/msg_mhf_enumerate_item.go index fea4f3371..022a0709a 100644 --- a/network/mhfpacket/msg_mhf_enumerate_item.go +++ b/network/mhfpacket/msg_mhf_enumerate_item.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfEnumerateItem represents the MSG_MHF_ENUMERATE_ITEM diff --git a/network/mhfpacket/msg_mhf_enumerate_mercenary_log.go b/network/mhfpacket/msg_mhf_enumerate_mercenary_log.go index 89bb419c3..e4405ce8c 100644 --- a/network/mhfpacket/msg_mhf_enumerate_mercenary_log.go +++ b/network/mhfpacket/msg_mhf_enumerate_mercenary_log.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfEnumerateMercenaryLog represents the MSG_MHF_ENUMERATE_MERCENARY_LOG diff --git a/network/mhfpacket/msg_mhf_enumerate_order.go b/network/mhfpacket/msg_mhf_enumerate_order.go index 84474106c..a7c6a8995 100644 --- a/network/mhfpacket/msg_mhf_enumerate_order.go +++ b/network/mhfpacket/msg_mhf_enumerate_order.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfEnumerateOrder represents the MSG_MHF_ENUMERATE_ORDER diff --git a/network/mhfpacket/msg_mhf_enumerate_price.go b/network/mhfpacket/msg_mhf_enumerate_price.go index e36246364..256fde2ff 100644 --- a/network/mhfpacket/msg_mhf_enumerate_price.go +++ b/network/mhfpacket/msg_mhf_enumerate_price.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfEnumeratePrice represents the MSG_MHF_ENUMERATE_PRICE diff --git a/network/mhfpacket/msg_mhf_enumerate_quest.go b/network/mhfpacket/msg_mhf_enumerate_quest.go index 243dffcfa..ecc2c3056 100644 --- a/network/mhfpacket/msg_mhf_enumerate_quest.go +++ b/network/mhfpacket/msg_mhf_enumerate_quest.go @@ -4,9 +4,9 @@ import ( "errors" _config "erupe-ce/config" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfEnumerateQuest represents the MSG_MHF_ENUMERATE_QUEST diff --git a/network/mhfpacket/msg_mhf_enumerate_ranking.go b/network/mhfpacket/msg_mhf_enumerate_ranking.go index a891a0e12..07f93851a 100644 --- a/network/mhfpacket/msg_mhf_enumerate_ranking.go +++ b/network/mhfpacket/msg_mhf_enumerate_ranking.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfEnumerateRanking represents the MSG_MHF_ENUMERATE_RANKING diff --git a/network/mhfpacket/msg_mhf_enumerate_rengoku_ranking.go b/network/mhfpacket/msg_mhf_enumerate_rengoku_ranking.go index 21817237d..94dd1f775 100644 --- a/network/mhfpacket/msg_mhf_enumerate_rengoku_ranking.go +++ b/network/mhfpacket/msg_mhf_enumerate_rengoku_ranking.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfEnumerateRengokuRanking represents the MSG_MHF_ENUMERATE_RENGOKU_RANKING diff --git a/network/mhfpacket/msg_mhf_enumerate_shop.go b/network/mhfpacket/msg_mhf_enumerate_shop.go index d57655e98..3c298a7b6 100644 --- a/network/mhfpacket/msg_mhf_enumerate_shop.go +++ b/network/mhfpacket/msg_mhf_enumerate_shop.go @@ -4,9 +4,9 @@ import ( "errors" _config "erupe-ce/config" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfEnumerateShop represents the MSG_MHF_ENUMERATE_SHOP diff --git a/network/mhfpacket/msg_mhf_enumerate_title.go b/network/mhfpacket/msg_mhf_enumerate_title.go index 8506e7071..dc1a52a65 100644 --- a/network/mhfpacket/msg_mhf_enumerate_title.go +++ b/network/mhfpacket/msg_mhf_enumerate_title.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfEnumerateTitle represents the MSG_MHF_ENUMERATE_TITLE diff --git a/network/mhfpacket/msg_mhf_enumerate_union_item.go b/network/mhfpacket/msg_mhf_enumerate_union_item.go index 38ff89f5c..29bc797ae 100644 --- a/network/mhfpacket/msg_mhf_enumerate_union_item.go +++ b/network/mhfpacket/msg_mhf_enumerate_union_item.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfEnumerateUnionItem represents the MSG_MHF_ENUMERATE_UNION_ITEM diff --git a/network/mhfpacket/msg_mhf_enumerate_warehouse.go b/network/mhfpacket/msg_mhf_enumerate_warehouse.go index dbc740f80..d8d1d60d9 100644 --- a/network/mhfpacket/msg_mhf_enumerate_warehouse.go +++ b/network/mhfpacket/msg_mhf_enumerate_warehouse.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfEnumerateWarehouse represents the MSG_MHF_ENUMERATE_WAREHOUSE diff --git a/network/mhfpacket/msg_mhf_exchange_fpoint_2_item.go b/network/mhfpacket/msg_mhf_exchange_fpoint_2_item.go index 21d7b6b4a..095326c2e 100644 --- a/network/mhfpacket/msg_mhf_exchange_fpoint_2_item.go +++ b/network/mhfpacket/msg_mhf_exchange_fpoint_2_item.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfExchangeFpoint2Item represents the MSG_MHF_EXCHANGE_FPOINT_2_ITEM diff --git a/network/mhfpacket/msg_mhf_exchange_item_2_fpoint.go b/network/mhfpacket/msg_mhf_exchange_item_2_fpoint.go index fd611986d..dd3afc539 100644 --- a/network/mhfpacket/msg_mhf_exchange_item_2_fpoint.go +++ b/network/mhfpacket/msg_mhf_exchange_item_2_fpoint.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfExchangeItem2Fpoint represents the MSG_MHF_EXCHANGE_ITEM_2_FPOINT diff --git a/network/mhfpacket/msg_mhf_exchange_kouryou_point.go b/network/mhfpacket/msg_mhf_exchange_kouryou_point.go index 2a78435cc..5f9dfe9c7 100644 --- a/network/mhfpacket/msg_mhf_exchange_kouryou_point.go +++ b/network/mhfpacket/msg_mhf_exchange_kouryou_point.go @@ -1,15 +1,15 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfExchangeKouryouPoint represents the MSG_MHF_EXCHANGE_KOURYOU_POINT -type MsgMhfExchangeKouryouPoint struct{ +type MsgMhfExchangeKouryouPoint struct { AckHandle uint32 KouryouPoints uint32 } diff --git a/network/mhfpacket/msg_mhf_exchange_weekly_stamp.go b/network/mhfpacket/msg_mhf_exchange_weekly_stamp.go index 829bb6fb2..1e735c6a3 100644 --- a/network/mhfpacket/msg_mhf_exchange_weekly_stamp.go +++ b/network/mhfpacket/msg_mhf_exchange_weekly_stamp.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfExchangeWeeklyStamp represents the MSG_MHF_EXCHANGE_WEEKLY_STAMP diff --git a/network/mhfpacket/msg_mhf_generate_ud_guild_map.go b/network/mhfpacket/msg_mhf_generate_ud_guild_map.go index f6d37beb2..70eef35b6 100644 --- a/network/mhfpacket/msg_mhf_generate_ud_guild_map.go +++ b/network/mhfpacket/msg_mhf_generate_ud_guild_map.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGenerateUdGuildMap represents the MSG_MHF_GENERATE_UD_GUILD_MAP diff --git a/network/mhfpacket/msg_mhf_get_achievement.go b/network/mhfpacket/msg_mhf_get_achievement.go index bca41bb7b..a012145e9 100644 --- a/network/mhfpacket/msg_mhf_get_achievement.go +++ b/network/mhfpacket/msg_mhf_get_achievement.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetAchievement represents the MSG_MHF_GET_ACHIEVEMENT diff --git a/network/mhfpacket/msg_mhf_get_additional_beat_reward.go b/network/mhfpacket/msg_mhf_get_additional_beat_reward.go index 76e9cacfd..2539a3b57 100644 --- a/network/mhfpacket/msg_mhf_get_additional_beat_reward.go +++ b/network/mhfpacket/msg_mhf_get_additional_beat_reward.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetAdditionalBeatReward represents the MSG_MHF_GET_ADDITIONAL_BEAT_REWARD diff --git a/network/mhfpacket/msg_mhf_get_bbs_sns_status.go b/network/mhfpacket/msg_mhf_get_bbs_sns_status.go index 0c50f67e8..372bdc8cc 100644 --- a/network/mhfpacket/msg_mhf_get_bbs_sns_status.go +++ b/network/mhfpacket/msg_mhf_get_bbs_sns_status.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetBbsSnsStatus represents the MSG_MHF_GET_BBS_SNS_STATUS diff --git a/network/mhfpacket/msg_mhf_get_bbs_user_status.go b/network/mhfpacket/msg_mhf_get_bbs_user_status.go index 9c44faa76..d4c5f5e72 100644 --- a/network/mhfpacket/msg_mhf_get_bbs_user_status.go +++ b/network/mhfpacket/msg_mhf_get_bbs_user_status.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetBbsUserStatus represents the MSG_MHF_GET_BBS_USER_STATUS diff --git a/network/mhfpacket/msg_mhf_get_boost_right.go b/network/mhfpacket/msg_mhf_get_boost_right.go index 88020bd1f..314db104e 100644 --- a/network/mhfpacket/msg_mhf_get_boost_right.go +++ b/network/mhfpacket/msg_mhf_get_boost_right.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetBoostRight represents the MSG_MHF_GET_BOOST_RIGHT diff --git a/network/mhfpacket/msg_mhf_get_boost_time.go b/network/mhfpacket/msg_mhf_get_boost_time.go index ce563d14d..14e42deb5 100644 --- a/network/mhfpacket/msg_mhf_get_boost_time.go +++ b/network/mhfpacket/msg_mhf_get_boost_time.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetBoostTime represents the MSG_MHF_GET_BOOST_TIME diff --git a/network/mhfpacket/msg_mhf_get_boost_time_limit.go b/network/mhfpacket/msg_mhf_get_boost_time_limit.go index d42918162..fc912fef9 100644 --- a/network/mhfpacket/msg_mhf_get_boost_time_limit.go +++ b/network/mhfpacket/msg_mhf_get_boost_time_limit.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetBoostTimeLimit represents the MSG_MHF_GET_BOOST_TIME_LIMIT diff --git a/network/mhfpacket/msg_mhf_get_box_gacha_info.go b/network/mhfpacket/msg_mhf_get_box_gacha_info.go index b944e6c11..4e80e48fc 100644 --- a/network/mhfpacket/msg_mhf_get_box_gacha_info.go +++ b/network/mhfpacket/msg_mhf_get_box_gacha_info.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetBoxGachaInfo represents the MSG_MHF_GET_BOX_GACHA_INFO diff --git a/network/mhfpacket/msg_mhf_get_break_seibatu_level_reward.go b/network/mhfpacket/msg_mhf_get_break_seibatu_level_reward.go index 601dd5cb2..756d39f4c 100644 --- a/network/mhfpacket/msg_mhf_get_break_seibatu_level_reward.go +++ b/network/mhfpacket/msg_mhf_get_break_seibatu_level_reward.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetBreakSeibatuLevelReward represents the MSG_MHF_GET_BREAK_SEIBATU_LEVEL_REWARD diff --git a/network/mhfpacket/msg_mhf_get_ca_achievement_hist.go b/network/mhfpacket/msg_mhf_get_ca_achievement_hist.go index b48f49d24..8ff2721ac 100644 --- a/network/mhfpacket/msg_mhf_get_ca_achievement_hist.go +++ b/network/mhfpacket/msg_mhf_get_ca_achievement_hist.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetCaAchievementHist represents the MSG_MHF_GET_CA_ACHIEVEMENT_HIST diff --git a/network/mhfpacket/msg_mhf_get_ca_unique_id.go b/network/mhfpacket/msg_mhf_get_ca_unique_id.go index 193d5cc1d..31e69c34f 100644 --- a/network/mhfpacket/msg_mhf_get_ca_unique_id.go +++ b/network/mhfpacket/msg_mhf_get_ca_unique_id.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetCaUniqueID represents the MSG_MHF_GET_CA_UNIQUE_ID diff --git a/network/mhfpacket/msg_mhf_get_cafe_duration.go b/network/mhfpacket/msg_mhf_get_cafe_duration.go index 8204b708c..080a228e5 100644 --- a/network/mhfpacket/msg_mhf_get_cafe_duration.go +++ b/network/mhfpacket/msg_mhf_get_cafe_duration.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetCafeDuration represents the MSG_MHF_GET_CAFE_DURATION diff --git a/network/mhfpacket/msg_mhf_get_cafe_duration_bonus_info.go b/network/mhfpacket/msg_mhf_get_cafe_duration_bonus_info.go index 7d357bc95..a952ca963 100644 --- a/network/mhfpacket/msg_mhf_get_cafe_duration_bonus_info.go +++ b/network/mhfpacket/msg_mhf_get_cafe_duration_bonus_info.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetCafeDurationBonusInfo represents the MSG_MHF_GET_CAFE_DURATION_BONUS_INFO diff --git a/network/mhfpacket/msg_mhf_get_cog_info.go b/network/mhfpacket/msg_mhf_get_cog_info.go index a843a15b0..93f0eefed 100644 --- a/network/mhfpacket/msg_mhf_get_cog_info.go +++ b/network/mhfpacket/msg_mhf_get_cog_info.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetCogInfo represents the MSG_MHF_GET_COG_INFO diff --git a/network/mhfpacket/msg_mhf_get_daily_mission_master.go b/network/mhfpacket/msg_mhf_get_daily_mission_master.go index 0690592eb..be4b020e7 100644 --- a/network/mhfpacket/msg_mhf_get_daily_mission_master.go +++ b/network/mhfpacket/msg_mhf_get_daily_mission_master.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetDailyMissionMaster represents the MSG_MHF_GET_DAILY_MISSION_MASTER diff --git a/network/mhfpacket/msg_mhf_get_daily_mission_personal.go b/network/mhfpacket/msg_mhf_get_daily_mission_personal.go index d6467ce55..ecb53c4a1 100644 --- a/network/mhfpacket/msg_mhf_get_daily_mission_personal.go +++ b/network/mhfpacket/msg_mhf_get_daily_mission_personal.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetDailyMissionPersonal represents the MSG_MHF_GET_DAILY_MISSION_PERSONAL diff --git a/network/mhfpacket/msg_mhf_get_dist_description.go b/network/mhfpacket/msg_mhf_get_dist_description.go index 94439c2e9..408d7d00c 100644 --- a/network/mhfpacket/msg_mhf_get_dist_description.go +++ b/network/mhfpacket/msg_mhf_get_dist_description.go @@ -1,17 +1,17 @@ package mhfpacket import ( - "errors" + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetDistDescription represents the MSG_MHF_GET_DIST_DESCRIPTION -type MsgMhfGetDistDescription struct{ - AckHandle uint32 - Unk0 uint8 +type MsgMhfGetDistDescription struct { + AckHandle uint32 + Unk0 uint8 DistributionID uint32 } @@ -27,7 +27,8 @@ func (m *MsgMhfGetDistDescription) Parse(bf *byteframe.ByteFrame, ctx *clientctx m.DistributionID = bf.ReadUint32() return nil } + // Build builds a binary packet from the current data. func (m *MsgMhfGetDistDescription) Build(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error { return errors.New("NOT IMPLEMENTED") -} \ No newline at end of file +} diff --git a/network/mhfpacket/msg_mhf_get_earth_status.go b/network/mhfpacket/msg_mhf_get_earth_status.go index e89855ec2..7ab49d8bd 100644 --- a/network/mhfpacket/msg_mhf_get_earth_status.go +++ b/network/mhfpacket/msg_mhf_get_earth_status.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetEarthStatus represents the MSG_MHF_GET_EARTH_STATUS diff --git a/network/mhfpacket/msg_mhf_get_earth_value.go b/network/mhfpacket/msg_mhf_get_earth_value.go index 8fca9ae72..c9325c91a 100644 --- a/network/mhfpacket/msg_mhf_get_earth_value.go +++ b/network/mhfpacket/msg_mhf_get_earth_value.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetEarthValue represents the MSG_MHF_GET_EARTH_VALUE @@ -13,7 +13,7 @@ type MsgMhfGetEarthValue struct { AckHandle uint32 Unk0 uint32 Unk1 uint32 - ReqType uint32 + ReqType uint32 Unk3 uint32 Unk4 uint32 Unk5 uint32 diff --git a/network/mhfpacket/msg_mhf_get_enhanced_minidata.go b/network/mhfpacket/msg_mhf_get_enhanced_minidata.go index e60e7fbb1..7f6fe8b38 100644 --- a/network/mhfpacket/msg_mhf_get_enhanced_minidata.go +++ b/network/mhfpacket/msg_mhf_get_enhanced_minidata.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetEnhancedMinidata represents the MSG_MHF_GET_ENHANCED_MINIDATA diff --git a/network/mhfpacket/msg_mhf_get_equip_skin_hist.go b/network/mhfpacket/msg_mhf_get_equip_skin_hist.go index e3072a29f..53628b8fd 100644 --- a/network/mhfpacket/msg_mhf_get_equip_skin_hist.go +++ b/network/mhfpacket/msg_mhf_get_equip_skin_hist.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetEquipSkinHist represents the MSG_MHF_GET_EQUIP_SKIN_HIST diff --git a/network/mhfpacket/msg_mhf_get_etc_points.go b/network/mhfpacket/msg_mhf_get_etc_points.go index 009650bc7..efba17e87 100644 --- a/network/mhfpacket/msg_mhf_get_etc_points.go +++ b/network/mhfpacket/msg_mhf_get_etc_points.go @@ -3,7 +3,7 @@ package mhfpacket import ( "erupe-ce/network" "erupe-ce/network/clientctx" - "erupe-ce/common/byteframe" + "erupe-ce/utils/byteframe" ) // MsgMhfGetEtcPoints represents the MSG_MHF_GET_ETC_POINTS diff --git a/network/mhfpacket/msg_mhf_get_extra_info.go b/network/mhfpacket/msg_mhf_get_extra_info.go index cfea10761..88fb6f227 100644 --- a/network/mhfpacket/msg_mhf_get_extra_info.go +++ b/network/mhfpacket/msg_mhf_get_extra_info.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetExtraInfo represents the MSG_MHF_GET_EXTRA_INFO diff --git a/network/mhfpacket/msg_mhf_get_fixed_seibatu_ranking_table.go b/network/mhfpacket/msg_mhf_get_fixed_seibatu_ranking_table.go index 2d7cbbac4..53054af40 100644 --- a/network/mhfpacket/msg_mhf_get_fixed_seibatu_ranking_table.go +++ b/network/mhfpacket/msg_mhf_get_fixed_seibatu_ranking_table.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetFixedSeibatuRankingTable represents the MSG_MHF_GET_FIXED_SEIBATU_RANKING_TABLE diff --git a/network/mhfpacket/msg_mhf_get_fpoint_exchange_list.go b/network/mhfpacket/msg_mhf_get_fpoint_exchange_list.go index a2fdcaa43..bb410b695 100644 --- a/network/mhfpacket/msg_mhf_get_fpoint_exchange_list.go +++ b/network/mhfpacket/msg_mhf_get_fpoint_exchange_list.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetFpointExchangeList represents the MSG_MHF_GET_FPOINT_EXCHANGE_LIST diff --git a/network/mhfpacket/msg_mhf_get_gacha_play_history.go b/network/mhfpacket/msg_mhf_get_gacha_play_history.go index d8ccee4fb..dacea3517 100644 --- a/network/mhfpacket/msg_mhf_get_gacha_play_history.go +++ b/network/mhfpacket/msg_mhf_get_gacha_play_history.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetGachaPlayHistory represents the MSG_MHF_GET_GACHA_PLAY_HISTORY diff --git a/network/mhfpacket/msg_mhf_get_gacha_point.go b/network/mhfpacket/msg_mhf_get_gacha_point.go index c6b6bc0ce..a980be8a0 100644 --- a/network/mhfpacket/msg_mhf_get_gacha_point.go +++ b/network/mhfpacket/msg_mhf_get_gacha_point.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetGachaPoint represents the MSG_MHF_GET_GACHA_POINT diff --git a/network/mhfpacket/msg_mhf_get_gem_info.go b/network/mhfpacket/msg_mhf_get_gem_info.go index 28638bfd2..c44c36679 100644 --- a/network/mhfpacket/msg_mhf_get_gem_info.go +++ b/network/mhfpacket/msg_mhf_get_gem_info.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetGemInfo represents the MSG_MHF_GET_GEM_INFO diff --git a/network/mhfpacket/msg_mhf_get_guild_manage_right.go b/network/mhfpacket/msg_mhf_get_guild_manage_right.go index 8fae57750..bf9056b9c 100644 --- a/network/mhfpacket/msg_mhf_get_guild_manage_right.go +++ b/network/mhfpacket/msg_mhf_get_guild_manage_right.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetGuildManageRight represents the MSG_MHF_GET_GUILD_MANAGE_RIGHT diff --git a/network/mhfpacket/msg_mhf_get_guild_mission_list.go b/network/mhfpacket/msg_mhf_get_guild_mission_list.go index 5d37bf40a..80739f26a 100644 --- a/network/mhfpacket/msg_mhf_get_guild_mission_list.go +++ b/network/mhfpacket/msg_mhf_get_guild_mission_list.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetGuildMissionList represents the MSG_MHF_GET_GUILD_MISSION_LIST diff --git a/network/mhfpacket/msg_mhf_get_guild_mission_record.go b/network/mhfpacket/msg_mhf_get_guild_mission_record.go index d41da2f61..4b82ed968 100644 --- a/network/mhfpacket/msg_mhf_get_guild_mission_record.go +++ b/network/mhfpacket/msg_mhf_get_guild_mission_record.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetGuildMissionRecord represents the MSG_MHF_GET_GUILD_MISSION_RECORD diff --git a/network/mhfpacket/msg_mhf_get_guild_scout_list.go b/network/mhfpacket/msg_mhf_get_guild_scout_list.go index 20ac5965e..01516b8e7 100644 --- a/network/mhfpacket/msg_mhf_get_guild_scout_list.go +++ b/network/mhfpacket/msg_mhf_get_guild_scout_list.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetGuildScoutList represents the MSG_MHF_GET_GUILD_SCOUT_LIST diff --git a/network/mhfpacket/msg_mhf_get_guild_target_member_num.go b/network/mhfpacket/msg_mhf_get_guild_target_member_num.go index 4633a1820..b25f5facd 100644 --- a/network/mhfpacket/msg_mhf_get_guild_target_member_num.go +++ b/network/mhfpacket/msg_mhf_get_guild_target_member_num.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetGuildTargetMemberNum represents the MSG_MHF_GET_GUILD_TARGET_MEMBER_NUM diff --git a/network/mhfpacket/msg_mhf_get_guild_tresure_souvenir.go b/network/mhfpacket/msg_mhf_get_guild_tresure_souvenir.go index ecbe48c3a..4ef9d6849 100644 --- a/network/mhfpacket/msg_mhf_get_guild_tresure_souvenir.go +++ b/network/mhfpacket/msg_mhf_get_guild_tresure_souvenir.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetGuildTresureSouvenir represents the MSG_MHF_GET_GUILD_TRESURE_SOUVENIR diff --git a/network/mhfpacket/msg_mhf_get_guild_weekly_bonus_active_count.go b/network/mhfpacket/msg_mhf_get_guild_weekly_bonus_active_count.go index 74140c34a..6ce17ba9e 100644 --- a/network/mhfpacket/msg_mhf_get_guild_weekly_bonus_active_count.go +++ b/network/mhfpacket/msg_mhf_get_guild_weekly_bonus_active_count.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetGuildWeeklyBonusActiveCount represents the MSG_MHF_GET_GUILD_WEEKLY_BONUS_ACTIVE_COUNT diff --git a/network/mhfpacket/msg_mhf_get_guild_weekly_bonus_master.go b/network/mhfpacket/msg_mhf_get_guild_weekly_bonus_master.go index 0a562c5bb..d65b42ff7 100644 --- a/network/mhfpacket/msg_mhf_get_guild_weekly_bonus_master.go +++ b/network/mhfpacket/msg_mhf_get_guild_weekly_bonus_master.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetGuildWeeklyBonusMaster represents the MSG_MHF_GET_GUILD_WEEKLY_BONUS_MASTER diff --git a/network/mhfpacket/msg_mhf_get_keep_login_boost_status.go b/network/mhfpacket/msg_mhf_get_keep_login_boost_status.go index 1fb84d550..a6453d20d 100644 --- a/network/mhfpacket/msg_mhf_get_keep_login_boost_status.go +++ b/network/mhfpacket/msg_mhf_get_keep_login_boost_status.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetKeepLoginBoostStatus represents the MSG_MHF_GET_KEEP_LOGIN_BOOST_STATUS diff --git a/network/mhfpacket/msg_mhf_get_kiju_info.go b/network/mhfpacket/msg_mhf_get_kiju_info.go index de548ce98..2137424dd 100644 --- a/network/mhfpacket/msg_mhf_get_kiju_info.go +++ b/network/mhfpacket/msg_mhf_get_kiju_info.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetKijuInfo represents the MSG_MHF_GET_KIJU_INFO diff --git a/network/mhfpacket/msg_mhf_get_kouryou_point.go b/network/mhfpacket/msg_mhf_get_kouryou_point.go index 2eebda798..8435abcf1 100644 --- a/network/mhfpacket/msg_mhf_get_kouryou_point.go +++ b/network/mhfpacket/msg_mhf_get_kouryou_point.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetKouryouPoint represents the MSG_MHF_GET_KOURYOU_POINT diff --git a/network/mhfpacket/msg_mhf_get_lobby_crowd.go b/network/mhfpacket/msg_mhf_get_lobby_crowd.go index 388f310fe..db1629a55 100644 --- a/network/mhfpacket/msg_mhf_get_lobby_crowd.go +++ b/network/mhfpacket/msg_mhf_get_lobby_crowd.go @@ -1,15 +1,15 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetLobbyCrowd represents the MSG_MHF_GET_LOBBY_CROWD -type MsgMhfGetLobbyCrowd struct{ +type MsgMhfGetLobbyCrowd struct { AckHandle uint32 Server uint32 Room uint32 diff --git a/network/mhfpacket/msg_mhf_get_myhouse_info.go b/network/mhfpacket/msg_mhf_get_myhouse_info.go index 8c71173ca..f043465ff 100644 --- a/network/mhfpacket/msg_mhf_get_myhouse_info.go +++ b/network/mhfpacket/msg_mhf_get_myhouse_info.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetMyhouseInfo represents the MSG_MHF_GET_MYHOUSE_INFO diff --git a/network/mhfpacket/msg_mhf_get_notice.go b/network/mhfpacket/msg_mhf_get_notice.go index 843e71ddc..09aed0fbf 100644 --- a/network/mhfpacket/msg_mhf_get_notice.go +++ b/network/mhfpacket/msg_mhf_get_notice.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetNotice represents the MSG_MHF_GET_NOTICE diff --git a/network/mhfpacket/msg_mhf_get_paper_data.go b/network/mhfpacket/msg_mhf_get_paper_data.go index 28d331af3..37c856c1f 100644 --- a/network/mhfpacket/msg_mhf_get_paper_data.go +++ b/network/mhfpacket/msg_mhf_get_paper_data.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetPaperData represents the MSG_MHF_GET_PAPER_DATA diff --git a/network/mhfpacket/msg_mhf_get_rand_from_table.go b/network/mhfpacket/msg_mhf_get_rand_from_table.go index dac9bf14e..bc21109b5 100644 --- a/network/mhfpacket/msg_mhf_get_rand_from_table.go +++ b/network/mhfpacket/msg_mhf_get_rand_from_table.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetRandFromTable represents the MSG_MHF_GET_RAND_FROM_TABLE diff --git a/network/mhfpacket/msg_mhf_get_reject_guild_scout.go b/network/mhfpacket/msg_mhf_get_reject_guild_scout.go index ac7cb607c..bf09e39f0 100644 --- a/network/mhfpacket/msg_mhf_get_reject_guild_scout.go +++ b/network/mhfpacket/msg_mhf_get_reject_guild_scout.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetRejectGuildScout represents the MSG_MHF_GET_REJECT_GUILD_SCOUT diff --git a/network/mhfpacket/msg_mhf_get_rengoku_binary.go b/network/mhfpacket/msg_mhf_get_rengoku_binary.go index f7dda97ad..d48842d44 100644 --- a/network/mhfpacket/msg_mhf_get_rengoku_binary.go +++ b/network/mhfpacket/msg_mhf_get_rengoku_binary.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetRengokuBinary represents the MSG_MHF_GET_RENGOKU_BINARY diff --git a/network/mhfpacket/msg_mhf_get_rengoku_ranking_rank.go b/network/mhfpacket/msg_mhf_get_rengoku_ranking_rank.go index 0e6da4b83..4bc15ee32 100644 --- a/network/mhfpacket/msg_mhf_get_rengoku_ranking_rank.go +++ b/network/mhfpacket/msg_mhf_get_rengoku_ranking_rank.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetRengokuRankingRank represents the MSG_MHF_GET_RENGOKU_RANKING_RANK diff --git a/network/mhfpacket/msg_mhf_get_restriction_event.go b/network/mhfpacket/msg_mhf_get_restriction_event.go index 58ff86375..be1ff2b99 100644 --- a/network/mhfpacket/msg_mhf_get_restriction_event.go +++ b/network/mhfpacket/msg_mhf_get_restriction_event.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetRestrictionEvent represents the MSG_MHF_GET_RESTRICTION_EVENT diff --git a/network/mhfpacket/msg_mhf_get_reward_song.go b/network/mhfpacket/msg_mhf_get_reward_song.go index a861740d2..d107128bb 100644 --- a/network/mhfpacket/msg_mhf_get_reward_song.go +++ b/network/mhfpacket/msg_mhf_get_reward_song.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetRewardSong represents the MSG_MHF_GET_REWARD_SONG diff --git a/network/mhfpacket/msg_mhf_get_ryoudama.go b/network/mhfpacket/msg_mhf_get_ryoudama.go index 91d1566af..bbf54f527 100644 --- a/network/mhfpacket/msg_mhf_get_ryoudama.go +++ b/network/mhfpacket/msg_mhf_get_ryoudama.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetRyoudama represents the MSG_MHF_GET_RYOUDAMA diff --git a/network/mhfpacket/msg_mhf_get_seibattle.go b/network/mhfpacket/msg_mhf_get_seibattle.go index 1398b477d..81d314e1a 100644 --- a/network/mhfpacket/msg_mhf_get_seibattle.go +++ b/network/mhfpacket/msg_mhf_get_seibattle.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetSeibattle represents the MSG_MHF_GET_SEIBATTLE diff --git a/network/mhfpacket/msg_mhf_get_senyu_daily_count.go b/network/mhfpacket/msg_mhf_get_senyu_daily_count.go index 4bc9f41d2..51424c697 100644 --- a/network/mhfpacket/msg_mhf_get_senyu_daily_count.go +++ b/network/mhfpacket/msg_mhf_get_senyu_daily_count.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetSenyuDailyCount represents the MSG_MHF_GET_SENYU_DAILY_COUNT diff --git a/network/mhfpacket/msg_mhf_get_stepup_status.go b/network/mhfpacket/msg_mhf_get_stepup_status.go index dcced8f4f..83d8b7c6f 100644 --- a/network/mhfpacket/msg_mhf_get_stepup_status.go +++ b/network/mhfpacket/msg_mhf_get_stepup_status.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetStepupStatus represents the MSG_MHF_GET_STEPUP_STATUS diff --git a/network/mhfpacket/msg_mhf_get_tenrouirai.go b/network/mhfpacket/msg_mhf_get_tenrouirai.go index a4784e39b..904d2ca91 100644 --- a/network/mhfpacket/msg_mhf_get_tenrouirai.go +++ b/network/mhfpacket/msg_mhf_get_tenrouirai.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetTenrouirai represents the MSG_MHF_GET_TENROUIRAI diff --git a/network/mhfpacket/msg_mhf_get_tiny_bin.go b/network/mhfpacket/msg_mhf_get_tiny_bin.go index 4db9b05b9..b1850b719 100644 --- a/network/mhfpacket/msg_mhf_get_tiny_bin.go +++ b/network/mhfpacket/msg_mhf_get_tiny_bin.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetTinyBin represents the MSG_MHF_GET_TINY_BIN diff --git a/network/mhfpacket/msg_mhf_get_tower_info.go b/network/mhfpacket/msg_mhf_get_tower_info.go index 4041e26e4..e523193ed 100644 --- a/network/mhfpacket/msg_mhf_get_tower_info.go +++ b/network/mhfpacket/msg_mhf_get_tower_info.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetTowerInfo represents the MSG_MHF_GET_TOWER_INFO diff --git a/network/mhfpacket/msg_mhf_get_trend_weapon.go b/network/mhfpacket/msg_mhf_get_trend_weapon.go index e869ae732..f3e718518 100644 --- a/network/mhfpacket/msg_mhf_get_trend_weapon.go +++ b/network/mhfpacket/msg_mhf_get_trend_weapon.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetTrendWeapon represents the MSG_MHF_GET_TREND_WEAPON diff --git a/network/mhfpacket/msg_mhf_get_ud_bonus_quest_info.go b/network/mhfpacket/msg_mhf_get_ud_bonus_quest_info.go index 0d5f22405..935304861 100644 --- a/network/mhfpacket/msg_mhf_get_ud_bonus_quest_info.go +++ b/network/mhfpacket/msg_mhf_get_ud_bonus_quest_info.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetUdBonusQuestInfo represents the MSG_MHF_GET_UD_BONUS_QUEST_INFO diff --git a/network/mhfpacket/msg_mhf_get_ud_daily_present_list.go b/network/mhfpacket/msg_mhf_get_ud_daily_present_list.go index 7850af681..86c80d842 100644 --- a/network/mhfpacket/msg_mhf_get_ud_daily_present_list.go +++ b/network/mhfpacket/msg_mhf_get_ud_daily_present_list.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetUdDailyPresentList represents the MSG_MHF_GET_UD_DAILY_PRESENT_LIST diff --git a/network/mhfpacket/msg_mhf_get_ud_guild_map_info.go b/network/mhfpacket/msg_mhf_get_ud_guild_map_info.go index c302a427b..777071594 100644 --- a/network/mhfpacket/msg_mhf_get_ud_guild_map_info.go +++ b/network/mhfpacket/msg_mhf_get_ud_guild_map_info.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetUdGuildMapInfo represents the MSG_MHF_GET_UD_GUILD_MAP_INFO diff --git a/network/mhfpacket/msg_mhf_get_ud_info.go b/network/mhfpacket/msg_mhf_get_ud_info.go index 4186e01a0..7fc3475d6 100644 --- a/network/mhfpacket/msg_mhf_get_ud_info.go +++ b/network/mhfpacket/msg_mhf_get_ud_info.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetUdInfo represents the MSG_MHF_GET_UD_INFO diff --git a/network/mhfpacket/msg_mhf_get_ud_monster_point.go b/network/mhfpacket/msg_mhf_get_ud_monster_point.go index 66383ef73..d960d9292 100644 --- a/network/mhfpacket/msg_mhf_get_ud_monster_point.go +++ b/network/mhfpacket/msg_mhf_get_ud_monster_point.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetUdMonsterPoint represents the MSG_MHF_GET_UD_MONSTER_POINT diff --git a/network/mhfpacket/msg_mhf_get_ud_my_point.go b/network/mhfpacket/msg_mhf_get_ud_my_point.go index d74a86a4c..bbbacaf4a 100644 --- a/network/mhfpacket/msg_mhf_get_ud_my_point.go +++ b/network/mhfpacket/msg_mhf_get_ud_my_point.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetUdMyPoint represents the MSG_MHF_GET_UD_MY_POINT diff --git a/network/mhfpacket/msg_mhf_get_ud_my_ranking.go b/network/mhfpacket/msg_mhf_get_ud_my_ranking.go index 75efe0f00..c85aabf65 100644 --- a/network/mhfpacket/msg_mhf_get_ud_my_ranking.go +++ b/network/mhfpacket/msg_mhf_get_ud_my_ranking.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetUdMyRanking represents the MSG_MHF_GET_UD_MY_RANKING diff --git a/network/mhfpacket/msg_mhf_get_ud_norma_present_list.go b/network/mhfpacket/msg_mhf_get_ud_norma_present_list.go index f6bf838f6..a0d7187a4 100644 --- a/network/mhfpacket/msg_mhf_get_ud_norma_present_list.go +++ b/network/mhfpacket/msg_mhf_get_ud_norma_present_list.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetUdNormaPresentList represents the MSG_MHF_GET_UD_NORMA_PRESENT_LIST diff --git a/network/mhfpacket/msg_mhf_get_ud_ranking.go b/network/mhfpacket/msg_mhf_get_ud_ranking.go index b6ccc968e..b544e86a3 100644 --- a/network/mhfpacket/msg_mhf_get_ud_ranking.go +++ b/network/mhfpacket/msg_mhf_get_ud_ranking.go @@ -1,17 +1,17 @@ package mhfpacket import ( - "errors" + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetUdRanking represents the MSG_MHF_GET_UD_RANKING -type MsgMhfGetUdRanking struct{ +type MsgMhfGetUdRanking struct { AckHandle uint32 - Unk0 uint8 + Unk0 uint8 } // Opcode returns the ID associated with this packet type. @@ -22,7 +22,7 @@ func (m *MsgMhfGetUdRanking) Opcode() network.PacketID { // Parse parses the packet from binary func (m *MsgMhfGetUdRanking) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error { m.AckHandle = bf.ReadUint32() - m.Unk0 = bf.ReadUint8() + m.Unk0 = bf.ReadUint8() return nil } diff --git a/network/mhfpacket/msg_mhf_get_ud_ranking_reward_list.go b/network/mhfpacket/msg_mhf_get_ud_ranking_reward_list.go index b354c382a..a435c0077 100644 --- a/network/mhfpacket/msg_mhf_get_ud_ranking_reward_list.go +++ b/network/mhfpacket/msg_mhf_get_ud_ranking_reward_list.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetUdRankingRewardList represents the MSG_MHF_GET_UD_RANKING_REWARD_LIST diff --git a/network/mhfpacket/msg_mhf_get_ud_schedule.go b/network/mhfpacket/msg_mhf_get_ud_schedule.go index c94939126..278113c2b 100644 --- a/network/mhfpacket/msg_mhf_get_ud_schedule.go +++ b/network/mhfpacket/msg_mhf_get_ud_schedule.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetUdSchedule represents the MSG_MHF_GET_UD_SCHEDULE diff --git a/network/mhfpacket/msg_mhf_get_ud_selected_color_info.go b/network/mhfpacket/msg_mhf_get_ud_selected_color_info.go index ccbe3bbb2..bf8b44128 100644 --- a/network/mhfpacket/msg_mhf_get_ud_selected_color_info.go +++ b/network/mhfpacket/msg_mhf_get_ud_selected_color_info.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetUdSelectedColorInfo represents the MSG_MHF_GET_UD_SELECTED_COLOR_INFO diff --git a/network/mhfpacket/msg_mhf_get_ud_shop_coin.go b/network/mhfpacket/msg_mhf_get_ud_shop_coin.go index fd06d27ba..7688dacd4 100644 --- a/network/mhfpacket/msg_mhf_get_ud_shop_coin.go +++ b/network/mhfpacket/msg_mhf_get_ud_shop_coin.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetUdShopCoin represents the MSG_MHF_GET_UD_SHOP_COIN diff --git a/network/mhfpacket/msg_mhf_get_ud_tactics_bonus_quest.go b/network/mhfpacket/msg_mhf_get_ud_tactics_bonus_quest.go index e51a58cb3..c6e4a2888 100644 --- a/network/mhfpacket/msg_mhf_get_ud_tactics_bonus_quest.go +++ b/network/mhfpacket/msg_mhf_get_ud_tactics_bonus_quest.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetUdTacticsBonusQuest represents the MSG_MHF_GET_UD_TACTICS_BONUS_QUEST diff --git a/network/mhfpacket/msg_mhf_get_ud_tactics_first_quest_bonus.go b/network/mhfpacket/msg_mhf_get_ud_tactics_first_quest_bonus.go index d7f5c4ba0..d81dd24b9 100644 --- a/network/mhfpacket/msg_mhf_get_ud_tactics_first_quest_bonus.go +++ b/network/mhfpacket/msg_mhf_get_ud_tactics_first_quest_bonus.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetUdTacticsFirstQuestBonus represents the MSG_MHF_GET_UD_TACTICS_FIRST_QUEST_BONUS diff --git a/network/mhfpacket/msg_mhf_get_ud_tactics_follower.go b/network/mhfpacket/msg_mhf_get_ud_tactics_follower.go index 81407e954..32c05a270 100644 --- a/network/mhfpacket/msg_mhf_get_ud_tactics_follower.go +++ b/network/mhfpacket/msg_mhf_get_ud_tactics_follower.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetUdTacticsFollower represents the MSG_MHF_GET_UD_TACTICS_FOLLOWER diff --git a/network/mhfpacket/msg_mhf_get_ud_tactics_log.go b/network/mhfpacket/msg_mhf_get_ud_tactics_log.go index 673a68183..6202bace8 100644 --- a/network/mhfpacket/msg_mhf_get_ud_tactics_log.go +++ b/network/mhfpacket/msg_mhf_get_ud_tactics_log.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetUdTacticsLog represents the MSG_MHF_GET_UD_TACTICS_LOG diff --git a/network/mhfpacket/msg_mhf_get_ud_tactics_point.go b/network/mhfpacket/msg_mhf_get_ud_tactics_point.go index 0af79fac2..a69f35ec2 100644 --- a/network/mhfpacket/msg_mhf_get_ud_tactics_point.go +++ b/network/mhfpacket/msg_mhf_get_ud_tactics_point.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetUdTacticsPoint represents the MSG_MHF_GET_UD_TACTICS_POINT diff --git a/network/mhfpacket/msg_mhf_get_ud_tactics_ranking.go b/network/mhfpacket/msg_mhf_get_ud_tactics_ranking.go index fb392e95c..2f2d6e860 100644 --- a/network/mhfpacket/msg_mhf_get_ud_tactics_ranking.go +++ b/network/mhfpacket/msg_mhf_get_ud_tactics_ranking.go @@ -1,17 +1,17 @@ package mhfpacket import ( - "errors" + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetUdTacticsRanking represents the MSG_MHF_GET_UD_TACTICS_RANKING type MsgMhfGetUdTacticsRanking struct { - AckHandle uint32 - GuildID uint32 + AckHandle uint32 + GuildID uint32 } // Opcode returns the ID associated with this packet type. @@ -21,9 +21,9 @@ func (m *MsgMhfGetUdTacticsRanking) Opcode() network.PacketID { // Parse parses the packet from binary func (m *MsgMhfGetUdTacticsRanking) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error { - m.AckHandle = bf.ReadUint32() - m.GuildID = bf.ReadUint32() - return nil + m.AckHandle = bf.ReadUint32() + m.GuildID = bf.ReadUint32() + return nil } // Build builds a binary packet from the current data. diff --git a/network/mhfpacket/msg_mhf_get_ud_tactics_remaining_point.go b/network/mhfpacket/msg_mhf_get_ud_tactics_remaining_point.go index 94cf7e9f0..e44b69bef 100644 --- a/network/mhfpacket/msg_mhf_get_ud_tactics_remaining_point.go +++ b/network/mhfpacket/msg_mhf_get_ud_tactics_remaining_point.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetUdTacticsRemainingPoint represents the MSG_MHF_GET_UD_TACTICS_REMAINING_POINT diff --git a/network/mhfpacket/msg_mhf_get_ud_tactics_reward_list.go b/network/mhfpacket/msg_mhf_get_ud_tactics_reward_list.go index d1a314ef3..903b35752 100644 --- a/network/mhfpacket/msg_mhf_get_ud_tactics_reward_list.go +++ b/network/mhfpacket/msg_mhf_get_ud_tactics_reward_list.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetUdTacticsRewardList represents the MSG_MHF_GET_UD_TACTICS_REWARD_LIST diff --git a/network/mhfpacket/msg_mhf_get_ud_total_point_info.go b/network/mhfpacket/msg_mhf_get_ud_total_point_info.go index f3cd2bddc..00602c70e 100644 --- a/network/mhfpacket/msg_mhf_get_ud_total_point_info.go +++ b/network/mhfpacket/msg_mhf_get_ud_total_point_info.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetUdTotalPointInfo represents the MSG_MHF_GET_UD_TOTAL_POINT_INFO diff --git a/network/mhfpacket/msg_mhf_get_weekly_schedule.go b/network/mhfpacket/msg_mhf_get_weekly_schedule.go index 3fa239ca4..f4475d847 100644 --- a/network/mhfpacket/msg_mhf_get_weekly_schedule.go +++ b/network/mhfpacket/msg_mhf_get_weekly_schedule.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetWeeklySchedule represents the MSG_MHF_GET_WEEKLY_SCHEDULE diff --git a/network/mhfpacket/msg_mhf_get_weekly_seibatu_ranking_reward.go b/network/mhfpacket/msg_mhf_get_weekly_seibatu_ranking_reward.go index 2823ff525..2aa14d26f 100644 --- a/network/mhfpacket/msg_mhf_get_weekly_seibatu_ranking_reward.go +++ b/network/mhfpacket/msg_mhf_get_weekly_seibatu_ranking_reward.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGetWeeklySeibatuRankingReward represents the MSG_MHF_GET_WEEKLY_SEIBATU_RANKING_REWARD diff --git a/network/mhfpacket/msg_mhf_guild_huntdata.go b/network/mhfpacket/msg_mhf_guild_huntdata.go index 9e114c968..ea411ac20 100644 --- a/network/mhfpacket/msg_mhf_guild_huntdata.go +++ b/network/mhfpacket/msg_mhf_guild_huntdata.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfGuildHuntdata represents the MSG_MHF_GUILD_HUNTDATA diff --git a/network/mhfpacket/msg_mhf_info_festa.go b/network/mhfpacket/msg_mhf_info_festa.go index 0877e6a4c..e5bdb984a 100644 --- a/network/mhfpacket/msg_mhf_info_festa.go +++ b/network/mhfpacket/msg_mhf_info_festa.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfInfoFesta represents the MSG_MHF_INFO_FESTA diff --git a/network/mhfpacket/msg_mhf_info_guild.go b/network/mhfpacket/msg_mhf_info_guild.go index b4a6f39c3..084e74997 100644 --- a/network/mhfpacket/msg_mhf_info_guild.go +++ b/network/mhfpacket/msg_mhf_info_guild.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfInfoGuild represents the MSG_MHF_INFO_GUILD diff --git a/network/mhfpacket/msg_mhf_info_joint.go b/network/mhfpacket/msg_mhf_info_joint.go index c349c9768..3048ff237 100644 --- a/network/mhfpacket/msg_mhf_info_joint.go +++ b/network/mhfpacket/msg_mhf_info_joint.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfInfoJoint represents the MSG_MHF_INFO_JOINT diff --git a/network/mhfpacket/msg_mhf_info_scenario_counter.go b/network/mhfpacket/msg_mhf_info_scenario_counter.go index 50a57ec5a..8421502d5 100644 --- a/network/mhfpacket/msg_mhf_info_scenario_counter.go +++ b/network/mhfpacket/msg_mhf_info_scenario_counter.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfInfoScenarioCounter represents the MSG_MHF_INFO_SCENARIO_COUNTER diff --git a/network/mhfpacket/msg_mhf_info_tournament.go b/network/mhfpacket/msg_mhf_info_tournament.go index 9da465add..448e63a73 100644 --- a/network/mhfpacket/msg_mhf_info_tournament.go +++ b/network/mhfpacket/msg_mhf_info_tournament.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfInfoTournament represents the MSG_MHF_INFO_TOURNAMENT diff --git a/network/mhfpacket/msg_mhf_kick_export_force.go b/network/mhfpacket/msg_mhf_kick_export_force.go index 902e8b02b..0507a3047 100644 --- a/network/mhfpacket/msg_mhf_kick_export_force.go +++ b/network/mhfpacket/msg_mhf_kick_export_force.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfKickExportForce represents the MSG_MHF_KICK_EXPORT_FORCE diff --git a/network/mhfpacket/msg_mhf_list_mail.go b/network/mhfpacket/msg_mhf_list_mail.go index 645baf548..758f5e61f 100644 --- a/network/mhfpacket/msg_mhf_list_mail.go +++ b/network/mhfpacket/msg_mhf_list_mail.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfListMail represents the MSG_MHF_LIST_MAIL diff --git a/network/mhfpacket/msg_mhf_list_member.go b/network/mhfpacket/msg_mhf_list_member.go index bee4a4874..59895dfae 100644 --- a/network/mhfpacket/msg_mhf_list_member.go +++ b/network/mhfpacket/msg_mhf_list_member.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfListMember represents the MSG_MHF_LIST_MEMBER diff --git a/network/mhfpacket/msg_mhf_load_deco_myset.go b/network/mhfpacket/msg_mhf_load_deco_myset.go index c8c0fdba4..3c25bf9c0 100644 --- a/network/mhfpacket/msg_mhf_load_deco_myset.go +++ b/network/mhfpacket/msg_mhf_load_deco_myset.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfLoadDecoMyset represents the MSG_MHF_LOAD_DECO_MYSET diff --git a/network/mhfpacket/msg_mhf_load_favorite_quest.go b/network/mhfpacket/msg_mhf_load_favorite_quest.go index 6490cc9a7..47d888651 100644 --- a/network/mhfpacket/msg_mhf_load_favorite_quest.go +++ b/network/mhfpacket/msg_mhf_load_favorite_quest.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfLoadFavoriteQuest represents the MSG_MHF_LOAD_FAVORITE_QUEST diff --git a/network/mhfpacket/msg_mhf_load_guild_adventure.go b/network/mhfpacket/msg_mhf_load_guild_adventure.go index 53955a7e1..488c3e408 100644 --- a/network/mhfpacket/msg_mhf_load_guild_adventure.go +++ b/network/mhfpacket/msg_mhf_load_guild_adventure.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfLoadGuildAdventure represents the MSG_MHF_LOAD_GUILD_ADVENTURE diff --git a/network/mhfpacket/msg_mhf_load_guild_cooking.go b/network/mhfpacket/msg_mhf_load_guild_cooking.go index 0e293c073..fd41a3cbb 100644 --- a/network/mhfpacket/msg_mhf_load_guild_cooking.go +++ b/network/mhfpacket/msg_mhf_load_guild_cooking.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfLoadGuildCooking represents the MSG_MHF_LOAD_GUILD_COOKING diff --git a/network/mhfpacket/msg_mhf_load_house.go b/network/mhfpacket/msg_mhf_load_house.go index 138c8af22..01e048aee 100644 --- a/network/mhfpacket/msg_mhf_load_house.go +++ b/network/mhfpacket/msg_mhf_load_house.go @@ -2,11 +2,11 @@ package mhfpacket import ( "errors" - "erupe-ce/common/stringsupport" + "erupe-ce/utils/stringsupport" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfLoadHouse represents the MSG_MHF_LOAD_HOUSE diff --git a/network/mhfpacket/msg_mhf_load_hunter_navi.go b/network/mhfpacket/msg_mhf_load_hunter_navi.go index 5c02131b9..9232966ad 100644 --- a/network/mhfpacket/msg_mhf_load_hunter_navi.go +++ b/network/mhfpacket/msg_mhf_load_hunter_navi.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfLoadHunterNavi represents the MSG_MHF_LOAD_HUNTER_NAVI diff --git a/network/mhfpacket/msg_mhf_load_legend_dispatch.go b/network/mhfpacket/msg_mhf_load_legend_dispatch.go index 5d22265f9..ffacdd8f5 100644 --- a/network/mhfpacket/msg_mhf_load_legend_dispatch.go +++ b/network/mhfpacket/msg_mhf_load_legend_dispatch.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfLoadLegendDispatch represents the MSG_MHF_LOAD_LEGEND_DISPATCH diff --git a/network/mhfpacket/msg_mhf_load_mezfes_data.go b/network/mhfpacket/msg_mhf_load_mezfes_data.go index 194cbdc14..921ee2b3d 100644 --- a/network/mhfpacket/msg_mhf_load_mezfes_data.go +++ b/network/mhfpacket/msg_mhf_load_mezfes_data.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfLoadMezfesData represents the MSG_MHF_LOAD_MEZFES_DATA diff --git a/network/mhfpacket/msg_mhf_load_otomo_airou.go b/network/mhfpacket/msg_mhf_load_otomo_airou.go index e227ca08b..0b4e22c7e 100644 --- a/network/mhfpacket/msg_mhf_load_otomo_airou.go +++ b/network/mhfpacket/msg_mhf_load_otomo_airou.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfLoadOtomoAirou represents the MSG_MHF_LOAD_OTOMO_AIROU diff --git a/network/mhfpacket/msg_mhf_load_partner.go b/network/mhfpacket/msg_mhf_load_partner.go index 0921a3137..4a59ccd57 100644 --- a/network/mhfpacket/msg_mhf_load_partner.go +++ b/network/mhfpacket/msg_mhf_load_partner.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfLoadPartner represents the MSG_MHF_LOAD_PARTNER diff --git a/network/mhfpacket/msg_mhf_load_plate_box.go b/network/mhfpacket/msg_mhf_load_plate_box.go index 90cba90fe..65744978a 100644 --- a/network/mhfpacket/msg_mhf_load_plate_box.go +++ b/network/mhfpacket/msg_mhf_load_plate_box.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfLoadPlateBox represents the MSG_MHF_LOAD_PLATE_BOX diff --git a/network/mhfpacket/msg_mhf_load_plate_data.go b/network/mhfpacket/msg_mhf_load_plate_data.go index c942515d0..d5e768a35 100644 --- a/network/mhfpacket/msg_mhf_load_plate_data.go +++ b/network/mhfpacket/msg_mhf_load_plate_data.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfLoadPlateData represents the MSG_MHF_LOAD_PLATE_DATA diff --git a/network/mhfpacket/msg_mhf_load_plate_myset.go b/network/mhfpacket/msg_mhf_load_plate_myset.go index 2bcf99806..7e36df0c5 100644 --- a/network/mhfpacket/msg_mhf_load_plate_myset.go +++ b/network/mhfpacket/msg_mhf_load_plate_myset.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfLoadPlateMyset represents the MSG_MHF_LOAD_PLATE_MYSET diff --git a/network/mhfpacket/msg_mhf_load_rengoku_data.go b/network/mhfpacket/msg_mhf_load_rengoku_data.go index 3bf855d3f..091906cec 100644 --- a/network/mhfpacket/msg_mhf_load_rengoku_data.go +++ b/network/mhfpacket/msg_mhf_load_rengoku_data.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfLoadRengokuData represents the MSG_MHF_LOAD_RENGOKU_DATA diff --git a/network/mhfpacket/msg_mhf_load_scenario_data.go b/network/mhfpacket/msg_mhf_load_scenario_data.go index 387381877..f2b793593 100644 --- a/network/mhfpacket/msg_mhf_load_scenario_data.go +++ b/network/mhfpacket/msg_mhf_load_scenario_data.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfLoadScenarioData represents the MSG_MHF_LOAD_SCENARIO_DATA diff --git a/network/mhfpacket/msg_mhf_loaddata.go b/network/mhfpacket/msg_mhf_loaddata.go index 548bf65ed..dd2be28a3 100644 --- a/network/mhfpacket/msg_mhf_loaddata.go +++ b/network/mhfpacket/msg_mhf_loaddata.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfLoaddata represents the MSG_MHF_LOADDATA diff --git a/network/mhfpacket/msg_mhf_mercenary_huntdata.go b/network/mhfpacket/msg_mhf_mercenary_huntdata.go index bdcdf35a3..61f94e7c3 100644 --- a/network/mhfpacket/msg_mhf_mercenary_huntdata.go +++ b/network/mhfpacket/msg_mhf_mercenary_huntdata.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfMercenaryHuntdata represents the MSG_MHF_MERCENARY_HUNTDATA diff --git a/network/mhfpacket/msg_mhf_operate_guild.go b/network/mhfpacket/msg_mhf_operate_guild.go index 96803e89c..0359555fb 100644 --- a/network/mhfpacket/msg_mhf_operate_guild.go +++ b/network/mhfpacket/msg_mhf_operate_guild.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) type OperateGuildAction uint8 diff --git a/network/mhfpacket/msg_mhf_operate_guild_member.go b/network/mhfpacket/msg_mhf_operate_guild_member.go index 8daf82dc5..4b63c5d90 100644 --- a/network/mhfpacket/msg_mhf_operate_guild_member.go +++ b/network/mhfpacket/msg_mhf_operate_guild_member.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) type OperateGuildMemberAction uint8 diff --git a/network/mhfpacket/msg_mhf_operate_guild_tresure_report.go b/network/mhfpacket/msg_mhf_operate_guild_tresure_report.go index d2564fb00..5a9f9d27e 100644 --- a/network/mhfpacket/msg_mhf_operate_guild_tresure_report.go +++ b/network/mhfpacket/msg_mhf_operate_guild_tresure_report.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfOperateGuildTresureReport represents the MSG_MHF_OPERATE_GUILD_TRESURE_REPORT diff --git a/network/mhfpacket/msg_mhf_operate_joint.go b/network/mhfpacket/msg_mhf_operate_joint.go index eccb3139d..28771f291 100644 --- a/network/mhfpacket/msg_mhf_operate_joint.go +++ b/network/mhfpacket/msg_mhf_operate_joint.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) type OperateJointAction uint8 diff --git a/network/mhfpacket/msg_mhf_operate_warehouse.go b/network/mhfpacket/msg_mhf_operate_warehouse.go index 0ea57e6c6..5f704040c 100644 --- a/network/mhfpacket/msg_mhf_operate_warehouse.go +++ b/network/mhfpacket/msg_mhf_operate_warehouse.go @@ -2,11 +2,11 @@ package mhfpacket import ( "errors" - "erupe-ce/common/stringsupport" + "erupe-ce/utils/stringsupport" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfOperateWarehouse represents the MSG_MHF_OPERATE_WAREHOUSE diff --git a/network/mhfpacket/msg_mhf_operation_inv_guild.go b/network/mhfpacket/msg_mhf_operation_inv_guild.go index bcd0b45b8..d639334b0 100644 --- a/network/mhfpacket/msg_mhf_operation_inv_guild.go +++ b/network/mhfpacket/msg_mhf_operation_inv_guild.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfOperationInvGuild represents the MSG_MHF_OPERATION_INV_GUILD diff --git a/network/mhfpacket/msg_mhf_opr_member.go b/network/mhfpacket/msg_mhf_opr_member.go index 186ccc44d..4b36e452a 100644 --- a/network/mhfpacket/msg_mhf_opr_member.go +++ b/network/mhfpacket/msg_mhf_opr_member.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfOprMember represents the MSG_MHF_OPR_MEMBER diff --git a/network/mhfpacket/msg_mhf_oprt_mail.go b/network/mhfpacket/msg_mhf_oprt_mail.go index 95ec561ee..eb510ebe4 100644 --- a/network/mhfpacket/msg_mhf_oprt_mail.go +++ b/network/mhfpacket/msg_mhf_oprt_mail.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) type OperateMailOperation uint8 diff --git a/network/mhfpacket/msg_mhf_payment_achievement.go b/network/mhfpacket/msg_mhf_payment_achievement.go index 79ac7de14..f806b1836 100644 --- a/network/mhfpacket/msg_mhf_payment_achievement.go +++ b/network/mhfpacket/msg_mhf_payment_achievement.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfPaymentAchievement represents the MSG_MHF_PAYMENT_ACHIEVEMENT diff --git a/network/mhfpacket/msg_mhf_play_box_gacha.go b/network/mhfpacket/msg_mhf_play_box_gacha.go index f09c018f8..3f3e04fb2 100644 --- a/network/mhfpacket/msg_mhf_play_box_gacha.go +++ b/network/mhfpacket/msg_mhf_play_box_gacha.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfPlayBoxGacha represents the MSG_MHF_PLAY_BOX_GACHA diff --git a/network/mhfpacket/msg_mhf_play_free_gacha.go b/network/mhfpacket/msg_mhf_play_free_gacha.go index 6d57124f3..c86dad3b4 100644 --- a/network/mhfpacket/msg_mhf_play_free_gacha.go +++ b/network/mhfpacket/msg_mhf_play_free_gacha.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfPlayFreeGacha represents the MSG_MHF_PLAY_FREE_GACHA diff --git a/network/mhfpacket/msg_mhf_play_normal_gacha.go b/network/mhfpacket/msg_mhf_play_normal_gacha.go index 46f2706a6..96c825662 100644 --- a/network/mhfpacket/msg_mhf_play_normal_gacha.go +++ b/network/mhfpacket/msg_mhf_play_normal_gacha.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfPlayNormalGacha represents the MSG_MHF_PLAY_NORMAL_GACHA diff --git a/network/mhfpacket/msg_mhf_play_stepup_gacha.go b/network/mhfpacket/msg_mhf_play_stepup_gacha.go index 83808ae1a..5442dd812 100644 --- a/network/mhfpacket/msg_mhf_play_stepup_gacha.go +++ b/network/mhfpacket/msg_mhf_play_stepup_gacha.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfPlayStepupGacha represents the MSG_MHF_PLAY_STEPUP_GACHA diff --git a/network/mhfpacket/msg_mhf_post_boost_time.go b/network/mhfpacket/msg_mhf_post_boost_time.go index a345267fd..05b41d01f 100644 --- a/network/mhfpacket/msg_mhf_post_boost_time.go +++ b/network/mhfpacket/msg_mhf_post_boost_time.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfPostBoostTime represents the MSG_MHF_POST_BOOST_TIME diff --git a/network/mhfpacket/msg_mhf_post_boost_time_limit.go b/network/mhfpacket/msg_mhf_post_boost_time_limit.go index 259712ac8..a4e5ad9b3 100644 --- a/network/mhfpacket/msg_mhf_post_boost_time_limit.go +++ b/network/mhfpacket/msg_mhf_post_boost_time_limit.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfPostBoostTimeLimit represents the MSG_MHF_POST_BOOST_TIME_LIMIT diff --git a/network/mhfpacket/msg_mhf_post_boost_time_quest_return.go b/network/mhfpacket/msg_mhf_post_boost_time_quest_return.go index 34c1af357..a88c47d9b 100644 --- a/network/mhfpacket/msg_mhf_post_boost_time_quest_return.go +++ b/network/mhfpacket/msg_mhf_post_boost_time_quest_return.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfPostBoostTimeQuestReturn represents the MSG_MHF_POST_BOOST_TIME_QUEST_RETURN diff --git a/network/mhfpacket/msg_mhf_post_cafe_duration_bonus_received.go b/network/mhfpacket/msg_mhf_post_cafe_duration_bonus_received.go index baa102f61..36b59aac0 100644 --- a/network/mhfpacket/msg_mhf_post_cafe_duration_bonus_received.go +++ b/network/mhfpacket/msg_mhf_post_cafe_duration_bonus_received.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfPostCafeDurationBonusReceived represents the MSG_MHF_POST_CAFE_DURATION_BONUS_RECEIVED diff --git a/network/mhfpacket/msg_mhf_post_gem_info.go b/network/mhfpacket/msg_mhf_post_gem_info.go index d487670fc..d9310f168 100644 --- a/network/mhfpacket/msg_mhf_post_gem_info.go +++ b/network/mhfpacket/msg_mhf_post_gem_info.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfPostGemInfo represents the MSG_MHF_POST_GEM_INFO diff --git a/network/mhfpacket/msg_mhf_post_guild_scout.go b/network/mhfpacket/msg_mhf_post_guild_scout.go index 69b7ab6e9..1ee2bbe79 100644 --- a/network/mhfpacket/msg_mhf_post_guild_scout.go +++ b/network/mhfpacket/msg_mhf_post_guild_scout.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfPostGuildScout represents the MSG_MHF_POST_GUILD_SCOUT diff --git a/network/mhfpacket/msg_mhf_post_notice.go b/network/mhfpacket/msg_mhf_post_notice.go index 51eb945fa..730a46a02 100644 --- a/network/mhfpacket/msg_mhf_post_notice.go +++ b/network/mhfpacket/msg_mhf_post_notice.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfPostNotice represents the MSG_MHF_POST_NOTICE diff --git a/network/mhfpacket/msg_mhf_post_ryoudama.go b/network/mhfpacket/msg_mhf_post_ryoudama.go index 51fe57eb0..773b842ae 100644 --- a/network/mhfpacket/msg_mhf_post_ryoudama.go +++ b/network/mhfpacket/msg_mhf_post_ryoudama.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfPostRyoudama represents the MSG_MHF_POST_RYOUDAMA diff --git a/network/mhfpacket/msg_mhf_post_seibattle.go b/network/mhfpacket/msg_mhf_post_seibattle.go index 9c9101747..d5e6df240 100644 --- a/network/mhfpacket/msg_mhf_post_seibattle.go +++ b/network/mhfpacket/msg_mhf_post_seibattle.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfPostSeibattle represents the MSG_MHF_POST_SEIBATTLE diff --git a/network/mhfpacket/msg_mhf_post_tenrouirai.go b/network/mhfpacket/msg_mhf_post_tenrouirai.go index bc91279b4..424a53fd8 100644 --- a/network/mhfpacket/msg_mhf_post_tenrouirai.go +++ b/network/mhfpacket/msg_mhf_post_tenrouirai.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfPostTenrouirai represents the MSG_MHF_POST_TENROUIRAI diff --git a/network/mhfpacket/msg_mhf_post_tiny_bin.go b/network/mhfpacket/msg_mhf_post_tiny_bin.go index dd464d18d..abd0dd61b 100644 --- a/network/mhfpacket/msg_mhf_post_tiny_bin.go +++ b/network/mhfpacket/msg_mhf_post_tiny_bin.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfPostTinyBin represents the MSG_MHF_POST_TINY_BIN diff --git a/network/mhfpacket/msg_mhf_post_tower_info.go b/network/mhfpacket/msg_mhf_post_tower_info.go index 3808777e5..9352d54eb 100644 --- a/network/mhfpacket/msg_mhf_post_tower_info.go +++ b/network/mhfpacket/msg_mhf_post_tower_info.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfPostTowerInfo represents the MSG_MHF_POST_TOWER_INFO diff --git a/network/mhfpacket/msg_mhf_present_box.go b/network/mhfpacket/msg_mhf_present_box.go index d0064799c..5a7361a9e 100644 --- a/network/mhfpacket/msg_mhf_present_box.go +++ b/network/mhfpacket/msg_mhf_present_box.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfPresentBox represents the MSG_MHF_PRESENT_BOX diff --git a/network/mhfpacket/msg_mhf_read_beat_level.go b/network/mhfpacket/msg_mhf_read_beat_level.go index 858a265bc..8f8ec6439 100644 --- a/network/mhfpacket/msg_mhf_read_beat_level.go +++ b/network/mhfpacket/msg_mhf_read_beat_level.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfReadBeatLevel represents the MSG_MHF_READ_BEAT_LEVEL diff --git a/network/mhfpacket/msg_mhf_read_beat_level_all_ranking.go b/network/mhfpacket/msg_mhf_read_beat_level_all_ranking.go index d9bf48a2c..641e9fc6c 100644 --- a/network/mhfpacket/msg_mhf_read_beat_level_all_ranking.go +++ b/network/mhfpacket/msg_mhf_read_beat_level_all_ranking.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfReadBeatLevelAllRanking represents the MSG_MHF_READ_BEAT_LEVEL_ALL_RANKING diff --git a/network/mhfpacket/msg_mhf_read_beat_level_my_ranking.go b/network/mhfpacket/msg_mhf_read_beat_level_my_ranking.go index e51bba318..4c4f6df6a 100644 --- a/network/mhfpacket/msg_mhf_read_beat_level_my_ranking.go +++ b/network/mhfpacket/msg_mhf_read_beat_level_my_ranking.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfReadBeatLevelMyRanking represents the MSG_MHF_READ_BEAT_LEVEL_MY_RANKING diff --git a/network/mhfpacket/msg_mhf_read_guildcard.go b/network/mhfpacket/msg_mhf_read_guildcard.go index c844fe3b5..5375496e5 100644 --- a/network/mhfpacket/msg_mhf_read_guildcard.go +++ b/network/mhfpacket/msg_mhf_read_guildcard.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfReadGuildcard represents the MSG_MHF_READ_GUILDCARD diff --git a/network/mhfpacket/msg_mhf_read_last_week_beat_ranking.go b/network/mhfpacket/msg_mhf_read_last_week_beat_ranking.go index b52195578..622ee9e83 100644 --- a/network/mhfpacket/msg_mhf_read_last_week_beat_ranking.go +++ b/network/mhfpacket/msg_mhf_read_last_week_beat_ranking.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfReadLastWeekBeatRanking represents the MSG_MHF_READ_LAST_WEEK_BEAT_RANKING diff --git a/network/mhfpacket/msg_mhf_read_mail.go b/network/mhfpacket/msg_mhf_read_mail.go index 957f144f9..fa5225a17 100644 --- a/network/mhfpacket/msg_mhf_read_mail.go +++ b/network/mhfpacket/msg_mhf_read_mail.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfReadMail represents the MSG_MHF_READ_MAIL diff --git a/network/mhfpacket/msg_mhf_read_mercenary_m.go b/network/mhfpacket/msg_mhf_read_mercenary_m.go index 957b35f3a..63d20ae40 100644 --- a/network/mhfpacket/msg_mhf_read_mercenary_m.go +++ b/network/mhfpacket/msg_mhf_read_mercenary_m.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfReadMercenaryM represents the MSG_MHF_READ_MERCENARY_M diff --git a/network/mhfpacket/msg_mhf_read_mercenary_w.go b/network/mhfpacket/msg_mhf_read_mercenary_w.go index d70ef4f38..299aff467 100644 --- a/network/mhfpacket/msg_mhf_read_mercenary_w.go +++ b/network/mhfpacket/msg_mhf_read_mercenary_w.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfReadMercenaryW represents the MSG_MHF_READ_MERCENARY_W diff --git a/network/mhfpacket/msg_mhf_receive_cafe_duration_bonus.go b/network/mhfpacket/msg_mhf_receive_cafe_duration_bonus.go index fab7e1641..219700300 100644 --- a/network/mhfpacket/msg_mhf_receive_cafe_duration_bonus.go +++ b/network/mhfpacket/msg_mhf_receive_cafe_duration_bonus.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfReceiveCafeDurationBonus represents the MSG_MHF_RECEIVE_CAFE_DURATION_BONUS diff --git a/network/mhfpacket/msg_mhf_receive_gacha_item.go b/network/mhfpacket/msg_mhf_receive_gacha_item.go index 3f83d1d1b..affebe849 100644 --- a/network/mhfpacket/msg_mhf_receive_gacha_item.go +++ b/network/mhfpacket/msg_mhf_receive_gacha_item.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfReceiveGachaItem represents the MSG_MHF_RECEIVE_GACHA_ITEM diff --git a/network/mhfpacket/msg_mhf_regist_guild_adventure.go b/network/mhfpacket/msg_mhf_regist_guild_adventure.go index 9e4196d89..5badb886e 100644 --- a/network/mhfpacket/msg_mhf_regist_guild_adventure.go +++ b/network/mhfpacket/msg_mhf_regist_guild_adventure.go @@ -1,17 +1,17 @@ package mhfpacket import ( - "errors" + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfRegistGuildAdventure represents the MSG_MHF_REGIST_GUILD_ADVENTURE type MsgMhfRegistGuildAdventure struct { - AckHandle uint32 - Destination uint32 + AckHandle uint32 + Destination uint32 } // Opcode returns the ID associated with this packet type. @@ -21,10 +21,10 @@ func (m *MsgMhfRegistGuildAdventure) Opcode() network.PacketID { // Parse parses the packet from binary func (m *MsgMhfRegistGuildAdventure) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error { - m.AckHandle = bf.ReadUint32() - m.Destination = bf.ReadUint32() - _ = bf.ReadUint32() // CharID - return nil + m.AckHandle = bf.ReadUint32() + m.Destination = bf.ReadUint32() + _ = bf.ReadUint32() // CharID + return nil } // Build builds a binary packet from the current data. diff --git a/network/mhfpacket/msg_mhf_regist_guild_adventure_diva.go b/network/mhfpacket/msg_mhf_regist_guild_adventure_diva.go index 37944d3f8..d940cbc26 100644 --- a/network/mhfpacket/msg_mhf_regist_guild_adventure_diva.go +++ b/network/mhfpacket/msg_mhf_regist_guild_adventure_diva.go @@ -1,18 +1,18 @@ package mhfpacket import ( - "errors" + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfRegistGuildAdventureDiva represents the MSG_MHF_REGIST_GUILD_ADVENTURE_DIVA type MsgMhfRegistGuildAdventureDiva struct { - AckHandle uint32 - Destination uint32 - Charge uint32 + AckHandle uint32 + Destination uint32 + Charge uint32 } // Opcode returns the ID associated with this packet type. @@ -22,11 +22,11 @@ func (m *MsgMhfRegistGuildAdventureDiva) Opcode() network.PacketID { // Parse parses the packet from binary func (m *MsgMhfRegistGuildAdventureDiva) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error { - m.AckHandle = bf.ReadUint32() - m.Destination = bf.ReadUint32() - m.Charge = bf.ReadUint32() - _ = bf.ReadUint32() // CharID - return nil + m.AckHandle = bf.ReadUint32() + m.Destination = bf.ReadUint32() + m.Charge = bf.ReadUint32() + _ = bf.ReadUint32() // CharID + return nil } // Build builds a binary packet from the current data. diff --git a/network/mhfpacket/msg_mhf_regist_guild_cooking.go b/network/mhfpacket/msg_mhf_regist_guild_cooking.go index c3cbe0523..7123abe9f 100644 --- a/network/mhfpacket/msg_mhf_regist_guild_cooking.go +++ b/network/mhfpacket/msg_mhf_regist_guild_cooking.go @@ -1,19 +1,19 @@ package mhfpacket import ( - "errors" + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfRegistGuildCooking represents the MSG_MHF_REGIST_GUILD_COOKING -type MsgMhfRegistGuildCooking struct{ - AckHandle uint32 +type MsgMhfRegistGuildCooking struct { + AckHandle uint32 OverwriteID uint32 - MealID uint16 - Success uint8 + MealID uint16 + Success uint8 } // Opcode returns the ID associated with this packet type. diff --git a/network/mhfpacket/msg_mhf_regist_guild_tresure.go b/network/mhfpacket/msg_mhf_regist_guild_tresure.go index b8c24ff15..7a86d93ec 100644 --- a/network/mhfpacket/msg_mhf_regist_guild_tresure.go +++ b/network/mhfpacket/msg_mhf_regist_guild_tresure.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfRegistGuildTresure represents the MSG_MHF_REGIST_GUILD_TRESURE diff --git a/network/mhfpacket/msg_mhf_regist_spabi_time.go b/network/mhfpacket/msg_mhf_regist_spabi_time.go index 0b0830f77..c58c59624 100644 --- a/network/mhfpacket/msg_mhf_regist_spabi_time.go +++ b/network/mhfpacket/msg_mhf_regist_spabi_time.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfRegistSpabiTime represents the MSG_MHF_REGIST_SPABI_TIME diff --git a/network/mhfpacket/msg_mhf_register_event.go b/network/mhfpacket/msg_mhf_register_event.go index 46afb1a2e..69bf0fbf4 100644 --- a/network/mhfpacket/msg_mhf_register_event.go +++ b/network/mhfpacket/msg_mhf_register_event.go @@ -1,9 +1,9 @@ package mhfpacket import ( - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfRegisterEvent represents the MSG_MHF_REGISTER_EVENT diff --git a/network/mhfpacket/msg_mhf_release_event.go b/network/mhfpacket/msg_mhf_release_event.go index 20ebcdba0..193f84bd2 100644 --- a/network/mhfpacket/msg_mhf_release_event.go +++ b/network/mhfpacket/msg_mhf_release_event.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfReleaseEvent represents the MSG_MHF_RELEASE_EVENT diff --git a/network/mhfpacket/msg_mhf_reserve10f.go b/network/mhfpacket/msg_mhf_reserve10f.go index 5346ba4f7..f2cac896d 100644 --- a/network/mhfpacket/msg_mhf_reserve10f.go +++ b/network/mhfpacket/msg_mhf_reserve10f.go @@ -1,11 +1,11 @@ package mhfpacket import ( - "errors" + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfReserve10F represents the MSG_MHF_reserve10F diff --git a/network/mhfpacket/msg_mhf_reset_achievement.go b/network/mhfpacket/msg_mhf_reset_achievement.go index 07a1f4ff9..3eef7fef6 100644 --- a/network/mhfpacket/msg_mhf_reset_achievement.go +++ b/network/mhfpacket/msg_mhf_reset_achievement.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfResetAchievement represents the MSG_MHF_RESET_ACHIEVEMENT diff --git a/network/mhfpacket/msg_mhf_reset_box_gacha_info.go b/network/mhfpacket/msg_mhf_reset_box_gacha_info.go index 7a8c3ffcf..9cea6c36f 100644 --- a/network/mhfpacket/msg_mhf_reset_box_gacha_info.go +++ b/network/mhfpacket/msg_mhf_reset_box_gacha_info.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfResetBoxGachaInfo represents the MSG_MHF_RESET_BOX_GACHA_INFO diff --git a/network/mhfpacket/msg_mhf_reset_title.go b/network/mhfpacket/msg_mhf_reset_title.go index f1771ee07..27768a027 100644 --- a/network/mhfpacket/msg_mhf_reset_title.go +++ b/network/mhfpacket/msg_mhf_reset_title.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfResetTitle represents the MSG_MHF_RESET_TITLE diff --git a/network/mhfpacket/msg_mhf_save_deco_myset.go b/network/mhfpacket/msg_mhf_save_deco_myset.go index 08355a9c3..4fc789543 100644 --- a/network/mhfpacket/msg_mhf_save_deco_myset.go +++ b/network/mhfpacket/msg_mhf_save_deco_myset.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfSaveDecoMyset represents the MSG_MHF_SAVE_DECO_MYSET diff --git a/network/mhfpacket/msg_mhf_save_favorite_quest.go b/network/mhfpacket/msg_mhf_save_favorite_quest.go index 738d515ad..19bba81a8 100644 --- a/network/mhfpacket/msg_mhf_save_favorite_quest.go +++ b/network/mhfpacket/msg_mhf_save_favorite_quest.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfSaveFavoriteQuest represents the MSG_MHF_SAVE_FAVORITE_QUEST diff --git a/network/mhfpacket/msg_mhf_save_hunter_navi.go b/network/mhfpacket/msg_mhf_save_hunter_navi.go index fdd222bce..1e1419b47 100644 --- a/network/mhfpacket/msg_mhf_save_hunter_navi.go +++ b/network/mhfpacket/msg_mhf_save_hunter_navi.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfSaveHunterNavi represents the MSG_MHF_SAVE_HUNTER_NAVI diff --git a/network/mhfpacket/msg_mhf_save_mercenary.go b/network/mhfpacket/msg_mhf_save_mercenary.go index 8a9ddb9f8..e9bd12d05 100644 --- a/network/mhfpacket/msg_mhf_save_mercenary.go +++ b/network/mhfpacket/msg_mhf_save_mercenary.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfSaveMercenary represents the MSG_MHF_SAVE_MERCENARY diff --git a/network/mhfpacket/msg_mhf_save_mezfes_data.go b/network/mhfpacket/msg_mhf_save_mezfes_data.go index e7cf79d17..979a34dba 100644 --- a/network/mhfpacket/msg_mhf_save_mezfes_data.go +++ b/network/mhfpacket/msg_mhf_save_mezfes_data.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfSaveMezfesData represents the MSG_MHF_SAVE_MEZFES_DATA diff --git a/network/mhfpacket/msg_mhf_save_otomo_airou.go b/network/mhfpacket/msg_mhf_save_otomo_airou.go index 4e9bf4996..98fbc2f89 100644 --- a/network/mhfpacket/msg_mhf_save_otomo_airou.go +++ b/network/mhfpacket/msg_mhf_save_otomo_airou.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfSaveOtomoAirou represents the MSG_MHF_SAVE_OTOMO_AIROU diff --git a/network/mhfpacket/msg_mhf_save_partner.go b/network/mhfpacket/msg_mhf_save_partner.go index 4efab1458..419377c6e 100644 --- a/network/mhfpacket/msg_mhf_save_partner.go +++ b/network/mhfpacket/msg_mhf_save_partner.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfSavePartner represents the MSG_MHF_SAVE_PARTNER diff --git a/network/mhfpacket/msg_mhf_save_plate_box.go b/network/mhfpacket/msg_mhf_save_plate_box.go index c63f94ef7..201748140 100644 --- a/network/mhfpacket/msg_mhf_save_plate_box.go +++ b/network/mhfpacket/msg_mhf_save_plate_box.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfSavePlateBox represents the MSG_MHF_SAVE_PLATE_BOX diff --git a/network/mhfpacket/msg_mhf_save_plate_data.go b/network/mhfpacket/msg_mhf_save_plate_data.go index 74edd1189..dea6ebb78 100644 --- a/network/mhfpacket/msg_mhf_save_plate_data.go +++ b/network/mhfpacket/msg_mhf_save_plate_data.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfSavePlateData represents the MSG_MHF_SAVE_PLATE_DATA diff --git a/network/mhfpacket/msg_mhf_save_plate_myset.go b/network/mhfpacket/msg_mhf_save_plate_myset.go index 833b46b3e..bf5f5bffa 100644 --- a/network/mhfpacket/msg_mhf_save_plate_myset.go +++ b/network/mhfpacket/msg_mhf_save_plate_myset.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfSavePlateMyset represents the MSG_MHF_SAVE_PLATE_MYSET diff --git a/network/mhfpacket/msg_mhf_save_rengoku_data.go b/network/mhfpacket/msg_mhf_save_rengoku_data.go index 2681a98b9..cc3315b43 100644 --- a/network/mhfpacket/msg_mhf_save_rengoku_data.go +++ b/network/mhfpacket/msg_mhf_save_rengoku_data.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfSaveRengokuData represents the MSG_MHF_SAVE_RENGOKU_DATA diff --git a/network/mhfpacket/msg_mhf_save_scenario_data.go b/network/mhfpacket/msg_mhf_save_scenario_data.go index e07f775dc..99aab462c 100644 --- a/network/mhfpacket/msg_mhf_save_scenario_data.go +++ b/network/mhfpacket/msg_mhf_save_scenario_data.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfSaveScenarioData represents the MSG_MHF_SAVE_SCENARIO_DATA diff --git a/network/mhfpacket/msg_mhf_savedata.go b/network/mhfpacket/msg_mhf_savedata.go index cf41416f3..8921d3eaf 100644 --- a/network/mhfpacket/msg_mhf_savedata.go +++ b/network/mhfpacket/msg_mhf_savedata.go @@ -4,9 +4,9 @@ import ( "errors" _config "erupe-ce/config" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfSavedata represents the MSG_MHF_SAVEDATA diff --git a/network/mhfpacket/msg_mhf_send_mail.go b/network/mhfpacket/msg_mhf_send_mail.go index 2a21ef93b..bd393cb73 100644 --- a/network/mhfpacket/msg_mhf_send_mail.go +++ b/network/mhfpacket/msg_mhf_send_mail.go @@ -2,11 +2,11 @@ package mhfpacket import ( "errors" - "erupe-ce/common/stringsupport" + "erupe-ce/utils/stringsupport" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfSendMail represents the MSG_MHF_SEND_MAIL diff --git a/network/mhfpacket/msg_mhf_server_command.go b/network/mhfpacket/msg_mhf_server_command.go index 11c7040a6..c507a3574 100644 --- a/network/mhfpacket/msg_mhf_server_command.go +++ b/network/mhfpacket/msg_mhf_server_command.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfServerCommand represents the MSG_MHF_SERVER_COMMAND diff --git a/network/mhfpacket/msg_mhf_set_ca_achievement.go b/network/mhfpacket/msg_mhf_set_ca_achievement.go index ec83b5f42..9aeb254a4 100644 --- a/network/mhfpacket/msg_mhf_set_ca_achievement.go +++ b/network/mhfpacket/msg_mhf_set_ca_achievement.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfSetCaAchievement represents the MSG_MHF_SET_CA_ACHIEVEMENT diff --git a/network/mhfpacket/msg_mhf_set_ca_achievement_hist.go b/network/mhfpacket/msg_mhf_set_ca_achievement_hist.go index 0b4fad343..7375a2686 100644 --- a/network/mhfpacket/msg_mhf_set_ca_achievement_hist.go +++ b/network/mhfpacket/msg_mhf_set_ca_achievement_hist.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) type CaAchievementHist struct { diff --git a/network/mhfpacket/msg_mhf_set_daily_mission_personal.go b/network/mhfpacket/msg_mhf_set_daily_mission_personal.go index 6c21fb370..2aacdac0e 100644 --- a/network/mhfpacket/msg_mhf_set_daily_mission_personal.go +++ b/network/mhfpacket/msg_mhf_set_daily_mission_personal.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfSetDailyMissionPersonal represents the MSG_MHF_SET_DAILY_MISSION_PERSONAL diff --git a/network/mhfpacket/msg_mhf_set_enhanced_minidata.go b/network/mhfpacket/msg_mhf_set_enhanced_minidata.go index aa300ca54..372c03a51 100644 --- a/network/mhfpacket/msg_mhf_set_enhanced_minidata.go +++ b/network/mhfpacket/msg_mhf_set_enhanced_minidata.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfSetEnhancedMinidata represents the MSG_MHF_SET_ENHANCED_MINIDATA diff --git a/network/mhfpacket/msg_mhf_set_guild_manage_right.go b/network/mhfpacket/msg_mhf_set_guild_manage_right.go index 9eb2d8b21..117da18ad 100644 --- a/network/mhfpacket/msg_mhf_set_guild_manage_right.go +++ b/network/mhfpacket/msg_mhf_set_guild_manage_right.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfSetGuildManageRight represents the MSG_MHF_SET_GUILD_MANAGE_RIGHT diff --git a/network/mhfpacket/msg_mhf_set_guild_mission_target.go b/network/mhfpacket/msg_mhf_set_guild_mission_target.go index 768fb6423..9fa05fa3f 100644 --- a/network/mhfpacket/msg_mhf_set_guild_mission_target.go +++ b/network/mhfpacket/msg_mhf_set_guild_mission_target.go @@ -1,17 +1,17 @@ package mhfpacket import ( - "errors" + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfSetGuildMissionTarget represents the MSG_MHF_SET_GUILD_MISSION_TARGET type MsgMhfSetGuildMissionTarget struct { - AckHandle uint32 - MissionID uint32 + AckHandle uint32 + MissionID uint32 } // Opcode returns the ID associated with this packet type. @@ -21,9 +21,9 @@ func (m *MsgMhfSetGuildMissionTarget) Opcode() network.PacketID { // Parse parses the packet from binary func (m *MsgMhfSetGuildMissionTarget) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error { - m.AckHandle = bf.ReadUint32() - m.MissionID = bf.ReadUint32() - return nil + m.AckHandle = bf.ReadUint32() + m.MissionID = bf.ReadUint32() + return nil } // Build builds a binary packet from the current data. diff --git a/network/mhfpacket/msg_mhf_set_kiju.go b/network/mhfpacket/msg_mhf_set_kiju.go index 24cc82101..299809773 100644 --- a/network/mhfpacket/msg_mhf_set_kiju.go +++ b/network/mhfpacket/msg_mhf_set_kiju.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfSetKiju represents the MSG_MHF_SET_KIJU diff --git a/network/mhfpacket/msg_mhf_set_loginwindow.go b/network/mhfpacket/msg_mhf_set_loginwindow.go index 9b551e8a0..e7a824934 100644 --- a/network/mhfpacket/msg_mhf_set_loginwindow.go +++ b/network/mhfpacket/msg_mhf_set_loginwindow.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfSetLoginwindow represents the MSG_MHF_SET_LOGINWINDOW diff --git a/network/mhfpacket/msg_mhf_set_reject_guild_scout.go b/network/mhfpacket/msg_mhf_set_reject_guild_scout.go index f90d432f4..9fcd48859 100644 --- a/network/mhfpacket/msg_mhf_set_reject_guild_scout.go +++ b/network/mhfpacket/msg_mhf_set_reject_guild_scout.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfSetRejectGuildScout represents the MSG_MHF_SET_REJECT_GUILD_SCOUT diff --git a/network/mhfpacket/msg_mhf_set_restriction_event.go b/network/mhfpacket/msg_mhf_set_restriction_event.go index be97c5c2c..b24c6f1a5 100644 --- a/network/mhfpacket/msg_mhf_set_restriction_event.go +++ b/network/mhfpacket/msg_mhf_set_restriction_event.go @@ -1,20 +1,20 @@ package mhfpacket import ( - "errors" + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfSetRestrictionEvent represents the MSG_MHF_SET_RESTRICTION_EVENT type MsgMhfSetRestrictionEvent struct { - AckHandle uint32 - Unk0 uint32 - Unk1 uint32 - Unk2 uint32 - Unk3 uint8 + AckHandle uint32 + Unk0 uint32 + Unk1 uint32 + Unk2 uint32 + Unk3 uint8 } // Opcode returns the ID associated with this packet type. @@ -24,11 +24,11 @@ func (m *MsgMhfSetRestrictionEvent) Opcode() network.PacketID { // Parse parses the packet from binary func (m *MsgMhfSetRestrictionEvent) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error { - m.AckHandle = bf.ReadUint32() - m.Unk0 = bf.ReadUint32() - m.Unk1 = bf.ReadUint32() - m.Unk2 = bf.ReadUint32() - m.Unk3 = bf.ReadUint8() + m.AckHandle = bf.ReadUint32() + m.Unk0 = bf.ReadUint32() + m.Unk1 = bf.ReadUint32() + m.Unk2 = bf.ReadUint32() + m.Unk3 = bf.ReadUint8() return nil } diff --git a/network/mhfpacket/msg_mhf_set_ud_tactics_follower.go b/network/mhfpacket/msg_mhf_set_ud_tactics_follower.go index 84f2bafa6..a10e66ea0 100644 --- a/network/mhfpacket/msg_mhf_set_ud_tactics_follower.go +++ b/network/mhfpacket/msg_mhf_set_ud_tactics_follower.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfSetUdTacticsFollower represents the MSG_MHF_SET_UD_TACTICS_FOLLOWER diff --git a/network/mhfpacket/msg_mhf_sex_changer.go b/network/mhfpacket/msg_mhf_sex_changer.go index a8754feca..90602d21b 100644 --- a/network/mhfpacket/msg_mhf_sex_changer.go +++ b/network/mhfpacket/msg_mhf_sex_changer.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfSexChanger represents the MSG_MHF_SEX_CHANGER diff --git a/network/mhfpacket/msg_mhf_shut_client.go b/network/mhfpacket/msg_mhf_shut_client.go index c3b58ca4c..8d7dc7892 100644 --- a/network/mhfpacket/msg_mhf_shut_client.go +++ b/network/mhfpacket/msg_mhf_shut_client.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfShutClient represents the MSG_MHF_SHUT_CLIENT diff --git a/network/mhfpacket/msg_mhf_stampcard_prize.go b/network/mhfpacket/msg_mhf_stampcard_prize.go index 7ec4491d9..d7fcc932a 100644 --- a/network/mhfpacket/msg_mhf_stampcard_prize.go +++ b/network/mhfpacket/msg_mhf_stampcard_prize.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfStampcardPrize represents the MSG_MHF_STAMPCARD_PRIZE diff --git a/network/mhfpacket/msg_mhf_stampcard_stamp.go b/network/mhfpacket/msg_mhf_stampcard_stamp.go index 281134c9d..e3b5d2bf2 100644 --- a/network/mhfpacket/msg_mhf_stampcard_stamp.go +++ b/network/mhfpacket/msg_mhf_stampcard_stamp.go @@ -4,9 +4,9 @@ import ( "errors" _config "erupe-ce/config" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfStampcardStamp represents the MSG_MHF_STAMPCARD_STAMP diff --git a/network/mhfpacket/msg_mhf_start_boost_time.go b/network/mhfpacket/msg_mhf_start_boost_time.go index 583ab3ab0..1b40dbbe6 100644 --- a/network/mhfpacket/msg_mhf_start_boost_time.go +++ b/network/mhfpacket/msg_mhf_start_boost_time.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfStartBoostTime represents the MSG_MHF_START_BOOST_TIME diff --git a/network/mhfpacket/msg_mhf_state_campaign.go b/network/mhfpacket/msg_mhf_state_campaign.go index ab6342c55..bcb36001f 100644 --- a/network/mhfpacket/msg_mhf_state_campaign.go +++ b/network/mhfpacket/msg_mhf_state_campaign.go @@ -4,8 +4,8 @@ import ( "errors" "erupe-ce/network/clientctx" - "erupe-ce/common/byteframe" "erupe-ce/network" + "erupe-ce/utils/byteframe" ) // MsgMhfStateCampaign represents the MSG_MHF_STATE_CAMPAIGN diff --git a/network/mhfpacket/msg_mhf_state_festa_g.go b/network/mhfpacket/msg_mhf_state_festa_g.go index e356b98be..de5bfc5cc 100644 --- a/network/mhfpacket/msg_mhf_state_festa_g.go +++ b/network/mhfpacket/msg_mhf_state_festa_g.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfStateFestaG represents the MSG_MHF_STATE_FESTA_G diff --git a/network/mhfpacket/msg_mhf_state_festa_u.go b/network/mhfpacket/msg_mhf_state_festa_u.go index 013966dba..883ef5e65 100644 --- a/network/mhfpacket/msg_mhf_state_festa_u.go +++ b/network/mhfpacket/msg_mhf_state_festa_u.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfStateFestaU represents the MSG_MHF_STATE_FESTA_U diff --git a/network/mhfpacket/msg_mhf_transfer_item.go b/network/mhfpacket/msg_mhf_transfer_item.go index 69dfdb13f..25fb5b41d 100644 --- a/network/mhfpacket/msg_mhf_transfer_item.go +++ b/network/mhfpacket/msg_mhf_transfer_item.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfTransferItem represents the MSG_MHF_TRANSFER_ITEM diff --git a/network/mhfpacket/msg_mhf_transit_message.go b/network/mhfpacket/msg_mhf_transit_message.go index 1442af08d..6de75bd94 100644 --- a/network/mhfpacket/msg_mhf_transit_message.go +++ b/network/mhfpacket/msg_mhf_transit_message.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfTransitMessage represents the MSG_MHF_TRANSIT_MESSAGE diff --git a/network/mhfpacket/msg_mhf_unreserve_srg.go b/network/mhfpacket/msg_mhf_unreserve_srg.go index 9f545dabd..6fb2d5082 100644 --- a/network/mhfpacket/msg_mhf_unreserve_srg.go +++ b/network/mhfpacket/msg_mhf_unreserve_srg.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfUnreserveSrg represents the MSG_MHF_UNRESERVE_SRG diff --git a/network/mhfpacket/msg_mhf_update_beat_level.go b/network/mhfpacket/msg_mhf_update_beat_level.go index e00d50c93..5e2c67171 100644 --- a/network/mhfpacket/msg_mhf_update_beat_level.go +++ b/network/mhfpacket/msg_mhf_update_beat_level.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfUpdateBeatLevel represents the MSG_MHF_UPDATE_BEAT_LEVEL diff --git a/network/mhfpacket/msg_mhf_update_cafepoint.go b/network/mhfpacket/msg_mhf_update_cafepoint.go index aea9a43aa..0a344b95c 100644 --- a/network/mhfpacket/msg_mhf_update_cafepoint.go +++ b/network/mhfpacket/msg_mhf_update_cafepoint.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfUpdateCafepoint represents the MSG_MHF_UPDATE_CAFEPOINT diff --git a/network/mhfpacket/msg_mhf_update_equip_skin_hist.go b/network/mhfpacket/msg_mhf_update_equip_skin_hist.go index 3117fc8a9..a06a55308 100644 --- a/network/mhfpacket/msg_mhf_update_equip_skin_hist.go +++ b/network/mhfpacket/msg_mhf_update_equip_skin_hist.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfUpdateEquipSkinHist represents the MSG_MHF_UPDATE_EQUIP_SKIN_HIST diff --git a/network/mhfpacket/msg_mhf_update_etc_point.go b/network/mhfpacket/msg_mhf_update_etc_point.go index c73bf42ea..108bff5af 100644 --- a/network/mhfpacket/msg_mhf_update_etc_point.go +++ b/network/mhfpacket/msg_mhf_update_etc_point.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfUpdateEtcPoint represents the MSG_MHF_UPDATE_ETC_POINT diff --git a/network/mhfpacket/msg_mhf_update_force_guild_rank.go b/network/mhfpacket/msg_mhf_update_force_guild_rank.go index 4fc18bf9f..50e982af5 100644 --- a/network/mhfpacket/msg_mhf_update_force_guild_rank.go +++ b/network/mhfpacket/msg_mhf_update_force_guild_rank.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfUpdateForceGuildRank represents the MSG_MHF_UPDATE_FORCE_GUILD_RANK diff --git a/network/mhfpacket/msg_mhf_update_guacot.go b/network/mhfpacket/msg_mhf_update_guacot.go index 2afcbad5c..875350061 100644 --- a/network/mhfpacket/msg_mhf_update_guacot.go +++ b/network/mhfpacket/msg_mhf_update_guacot.go @@ -2,9 +2,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) type Goocoo struct { diff --git a/network/mhfpacket/msg_mhf_update_guild.go b/network/mhfpacket/msg_mhf_update_guild.go index 8cd0df4d0..f47e98d69 100644 --- a/network/mhfpacket/msg_mhf_update_guild.go +++ b/network/mhfpacket/msg_mhf_update_guild.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfUpdateGuild represents the MSG_MHF_UPDATE_GUILD diff --git a/network/mhfpacket/msg_mhf_update_guild_icon.go b/network/mhfpacket/msg_mhf_update_guild_icon.go index 248bb93ea..278782f35 100644 --- a/network/mhfpacket/msg_mhf_update_guild_icon.go +++ b/network/mhfpacket/msg_mhf_update_guild_icon.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) type GuildIconMsgPart struct { diff --git a/network/mhfpacket/msg_mhf_update_guild_item.go b/network/mhfpacket/msg_mhf_update_guild_item.go index 164adfb20..c5ec88155 100644 --- a/network/mhfpacket/msg_mhf_update_guild_item.go +++ b/network/mhfpacket/msg_mhf_update_guild_item.go @@ -2,11 +2,11 @@ package mhfpacket import ( "errors" - "erupe-ce/common/mhfitem" + "erupe-ce/utils/mhfitem" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfUpdateGuildItem represents the MSG_MHF_UPDATE_GUILD_ITEM diff --git a/network/mhfpacket/msg_mhf_update_guild_message_board.go b/network/mhfpacket/msg_mhf_update_guild_message_board.go index 94316cc52..0aef8330b 100644 --- a/network/mhfpacket/msg_mhf_update_guild_message_board.go +++ b/network/mhfpacket/msg_mhf_update_guild_message_board.go @@ -2,11 +2,11 @@ package mhfpacket import ( "errors" - "erupe-ce/common/stringsupport" + "erupe-ce/utils/stringsupport" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfUpdateGuildMessageBoard represents the MSG_MHF_UPDATE_GUILD_MESSAGE_BOARD diff --git a/network/mhfpacket/msg_mhf_update_guildcard.go b/network/mhfpacket/msg_mhf_update_guildcard.go index c1606d4e4..d1f660edb 100644 --- a/network/mhfpacket/msg_mhf_update_guildcard.go +++ b/network/mhfpacket/msg_mhf_update_guildcard.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfUpdateGuildcard represents the MSG_MHF_UPDATE_GUILDCARD diff --git a/network/mhfpacket/msg_mhf_update_house.go b/network/mhfpacket/msg_mhf_update_house.go index 2c6f0401d..456f6cf7b 100644 --- a/network/mhfpacket/msg_mhf_update_house.go +++ b/network/mhfpacket/msg_mhf_update_house.go @@ -2,11 +2,11 @@ package mhfpacket import ( "errors" - "erupe-ce/common/stringsupport" + "erupe-ce/utils/stringsupport" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfUpdateHouse represents the MSG_MHF_UPDATE_HOUSE diff --git a/network/mhfpacket/msg_mhf_update_interior.go b/network/mhfpacket/msg_mhf_update_interior.go index 21e32d299..e787dd01a 100644 --- a/network/mhfpacket/msg_mhf_update_interior.go +++ b/network/mhfpacket/msg_mhf_update_interior.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfUpdateInterior represents the MSG_MHF_UPDATE_INTERIOR diff --git a/network/mhfpacket/msg_mhf_update_myhouse_info.go b/network/mhfpacket/msg_mhf_update_myhouse_info.go index c5bf26d7a..aa2b332dc 100644 --- a/network/mhfpacket/msg_mhf_update_myhouse_info.go +++ b/network/mhfpacket/msg_mhf_update_myhouse_info.go @@ -3,10 +3,10 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" _config "erupe-ce/config" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfUpdateMyhouseInfo represents the MSG_MHF_UPDATE_MYHOUSE_INFO diff --git a/network/mhfpacket/msg_mhf_update_union_item.go b/network/mhfpacket/msg_mhf_update_union_item.go index f40dedd5f..fc256ce3f 100644 --- a/network/mhfpacket/msg_mhf_update_union_item.go +++ b/network/mhfpacket/msg_mhf_update_union_item.go @@ -2,11 +2,11 @@ package mhfpacket import ( "errors" - "erupe-ce/common/mhfitem" + "erupe-ce/utils/mhfitem" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfUpdateUnionItem represents the MSG_MHF_UPDATE_UNION_ITEM diff --git a/network/mhfpacket/msg_mhf_update_use_trend_weapon_log.go b/network/mhfpacket/msg_mhf_update_use_trend_weapon_log.go index 952ee85ec..02e378a2c 100644 --- a/network/mhfpacket/msg_mhf_update_use_trend_weapon_log.go +++ b/network/mhfpacket/msg_mhf_update_use_trend_weapon_log.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfUpdateUseTrendWeaponLog represents the MSG_MHF_UPDATE_USE_TREND_WEAPON_LOG diff --git a/network/mhfpacket/msg_mhf_update_warehouse.go b/network/mhfpacket/msg_mhf_update_warehouse.go index 9d264cf89..8fc025f29 100644 --- a/network/mhfpacket/msg_mhf_update_warehouse.go +++ b/network/mhfpacket/msg_mhf_update_warehouse.go @@ -2,10 +2,10 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" - "erupe-ce/common/mhfitem" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" + "erupe-ce/utils/mhfitem" ) // MsgMhfUpdateWarehouse represents the MSG_MHF_UPDATE_WAREHOUSE diff --git a/network/mhfpacket/msg_mhf_use_gacha_point.go b/network/mhfpacket/msg_mhf_use_gacha_point.go index 5245b5eaf..267f65846 100644 --- a/network/mhfpacket/msg_mhf_use_gacha_point.go +++ b/network/mhfpacket/msg_mhf_use_gacha_point.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfUseGachaPoint represents the MSG_MHF_USE_GACHA_POINT diff --git a/network/mhfpacket/msg_mhf_use_keep_login_boost.go b/network/mhfpacket/msg_mhf_use_keep_login_boost.go index 5d88f6c29..f85cdd20a 100644 --- a/network/mhfpacket/msg_mhf_use_keep_login_boost.go +++ b/network/mhfpacket/msg_mhf_use_keep_login_boost.go @@ -5,7 +5,7 @@ import ( "erupe-ce/network" "erupe-ce/network/clientctx" - "erupe-ce/common/byteframe" + "erupe-ce/utils/byteframe" ) // MsgMhfUseKeepLoginBoost represents the MSG_MHF_USE_KEEP_LOGIN_BOOST diff --git a/network/mhfpacket/msg_mhf_use_reward_song.go b/network/mhfpacket/msg_mhf_use_reward_song.go index 0a297e0fd..397c2279d 100644 --- a/network/mhfpacket/msg_mhf_use_reward_song.go +++ b/network/mhfpacket/msg_mhf_use_reward_song.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfUseRewardSong represents the MSG_MHF_USE_REWARD_SONG diff --git a/network/mhfpacket/msg_mhf_use_ud_shop_coin.go b/network/mhfpacket/msg_mhf_use_ud_shop_coin.go index 216a6896e..a41d21251 100644 --- a/network/mhfpacket/msg_mhf_use_ud_shop_coin.go +++ b/network/mhfpacket/msg_mhf_use_ud_shop_coin.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfUseUdShopCoin represents the MSG_MHF_USE_UD_SHOP_COIN diff --git a/network/mhfpacket/msg_mhf_vote_festa.go b/network/mhfpacket/msg_mhf_vote_festa.go index 201c1b5ac..eb3a5cf36 100644 --- a/network/mhfpacket/msg_mhf_vote_festa.go +++ b/network/mhfpacket/msg_mhf_vote_festa.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgMhfVoteFesta represents the MSG_MHF_VOTE_FESTA diff --git a/network/mhfpacket/msg_sys_ack.go b/network/mhfpacket/msg_sys_ack.go index f5c206f44..9d1ac553b 100644 --- a/network/mhfpacket/msg_sys_ack.go +++ b/network/mhfpacket/msg_sys_ack.go @@ -3,7 +3,7 @@ package mhfpacket import ( "erupe-ce/network" "erupe-ce/network/clientctx" - "erupe-ce/common/byteframe" + "erupe-ce/utils/byteframe" ) // MsgSysAck represents the MSG_SYS_ACK diff --git a/network/mhfpacket/msg_sys_acquire_semaphore.go b/network/mhfpacket/msg_sys_acquire_semaphore.go index 2be7284d9..e77baeeee 100644 --- a/network/mhfpacket/msg_sys_acquire_semaphore.go +++ b/network/mhfpacket/msg_sys_acquire_semaphore.go @@ -2,11 +2,11 @@ package mhfpacket import ( "errors" - "erupe-ce/common/bfutil" + "erupe-ce/utils/bfutil" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysAcquireSemaphore represents the MSG_SYS_ACQUIRE_SEMAPHORE diff --git a/network/mhfpacket/msg_sys_add_object.go b/network/mhfpacket/msg_sys_add_object.go index a1df28f31..f797d8210 100644 --- a/network/mhfpacket/msg_sys_add_object.go +++ b/network/mhfpacket/msg_sys_add_object.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysAddObject represents the MSG_SYS_ADD_OBJECT diff --git a/network/mhfpacket/msg_sys_auth_data.go b/network/mhfpacket/msg_sys_auth_data.go index 6978a3366..96768aeaf 100644 --- a/network/mhfpacket/msg_sys_auth_data.go +++ b/network/mhfpacket/msg_sys_auth_data.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysAuthData represents the MSG_SYS_AUTH_DATA diff --git a/network/mhfpacket/msg_sys_auth_query.go b/network/mhfpacket/msg_sys_auth_query.go index 93eca3457..f56843ddc 100644 --- a/network/mhfpacket/msg_sys_auth_query.go +++ b/network/mhfpacket/msg_sys_auth_query.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysAuthQuery represents the MSG_SYS_AUTH_QUERY diff --git a/network/mhfpacket/msg_sys_auth_terminal.go b/network/mhfpacket/msg_sys_auth_terminal.go index 292922c91..c87b84a8a 100644 --- a/network/mhfpacket/msg_sys_auth_terminal.go +++ b/network/mhfpacket/msg_sys_auth_terminal.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysAuthTerminal represents the MSG_SYS_AUTH_TERMINAL diff --git a/network/mhfpacket/msg_sys_back_stage.go b/network/mhfpacket/msg_sys_back_stage.go index 12464b5d6..21b0178fa 100644 --- a/network/mhfpacket/msg_sys_back_stage.go +++ b/network/mhfpacket/msg_sys_back_stage.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysBackStage represents the MSG_SYS_BACK_STAGE diff --git a/network/mhfpacket/msg_sys_cast_binary.go b/network/mhfpacket/msg_sys_cast_binary.go index f0b0c2bd3..93b2e1575 100644 --- a/network/mhfpacket/msg_sys_cast_binary.go +++ b/network/mhfpacket/msg_sys_cast_binary.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysCastBinary represents the MSG_SYS_CAST_BINARY diff --git a/network/mhfpacket/msg_sys_casted_binary.go b/network/mhfpacket/msg_sys_casted_binary.go index 5be8a01ef..9fd0997c3 100644 --- a/network/mhfpacket/msg_sys_casted_binary.go +++ b/network/mhfpacket/msg_sys_casted_binary.go @@ -3,7 +3,7 @@ package mhfpacket import ( "erupe-ce/network" "erupe-ce/network/clientctx" - "erupe-ce/common/byteframe" + "erupe-ce/utils/byteframe" ) // MsgSysCastedBinary represents the MSG_SYS_CASTED_BINARY diff --git a/network/mhfpacket/msg_sys_check_semaphore.go b/network/mhfpacket/msg_sys_check_semaphore.go index bea438759..4f3f6c6d7 100644 --- a/network/mhfpacket/msg_sys_check_semaphore.go +++ b/network/mhfpacket/msg_sys_check_semaphore.go @@ -2,11 +2,11 @@ package mhfpacket import ( "errors" - "erupe-ce/common/bfutil" + "erupe-ce/utils/bfutil" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysCheckSemaphore represents the MSG_SYS_CHECK_SEMAPHORE diff --git a/network/mhfpacket/msg_sys_cleanup_object.go b/network/mhfpacket/msg_sys_cleanup_object.go index 433daf697..487e212fa 100644 --- a/network/mhfpacket/msg_sys_cleanup_object.go +++ b/network/mhfpacket/msg_sys_cleanup_object.go @@ -3,7 +3,7 @@ package mhfpacket import ( "erupe-ce/network" "erupe-ce/network/clientctx" - "erupe-ce/common/byteframe" + "erupe-ce/utils/byteframe" ) // MsgSysCleanupObject represents the MSG_SYS_CLEANUP_OBJECT diff --git a/network/mhfpacket/msg_sys_close_mutex.go b/network/mhfpacket/msg_sys_close_mutex.go index 188a8e33a..90e2d517c 100644 --- a/network/mhfpacket/msg_sys_close_mutex.go +++ b/network/mhfpacket/msg_sys_close_mutex.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysCloseMutex represents the MSG_SYS_CLOSE_MUTEX diff --git a/network/mhfpacket/msg_sys_collect_binary.go b/network/mhfpacket/msg_sys_collect_binary.go index 0479e08cf..a857e1afd 100644 --- a/network/mhfpacket/msg_sys_collect_binary.go +++ b/network/mhfpacket/msg_sys_collect_binary.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysCollectBinary represents the MSG_SYS_COLLECT_BINARY diff --git a/network/mhfpacket/msg_sys_create_acquire_semaphore.go b/network/mhfpacket/msg_sys_create_acquire_semaphore.go index 9e22c50e7..e855e4907 100644 --- a/network/mhfpacket/msg_sys_create_acquire_semaphore.go +++ b/network/mhfpacket/msg_sys_create_acquire_semaphore.go @@ -2,10 +2,10 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" _config "erupe-ce/config" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysCreateAcquireSemaphore represents the MSG_SYS_CREATE_ACQUIRE_SEMAPHORE diff --git a/network/mhfpacket/msg_sys_create_mutex.go b/network/mhfpacket/msg_sys_create_mutex.go index 111a32da1..4f5c8dd11 100644 --- a/network/mhfpacket/msg_sys_create_mutex.go +++ b/network/mhfpacket/msg_sys_create_mutex.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysCreateMutex represents the MSG_SYS_CREATE_MUTEX diff --git a/network/mhfpacket/msg_sys_create_object.go b/network/mhfpacket/msg_sys_create_object.go index e6a15d67d..80545a70f 100644 --- a/network/mhfpacket/msg_sys_create_object.go +++ b/network/mhfpacket/msg_sys_create_object.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysCreateObject represents the MSG_SYS_CREATE_OBJECT diff --git a/network/mhfpacket/msg_sys_create_open_mutex.go b/network/mhfpacket/msg_sys_create_open_mutex.go index 9c01a57a8..d35ba1573 100644 --- a/network/mhfpacket/msg_sys_create_open_mutex.go +++ b/network/mhfpacket/msg_sys_create_open_mutex.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysCreateOpenMutex represents the MSG_SYS_CREATE_OPEN_MUTEX diff --git a/network/mhfpacket/msg_sys_create_semaphore.go b/network/mhfpacket/msg_sys_create_semaphore.go index c9b29d2ab..bb0a7d6de 100644 --- a/network/mhfpacket/msg_sys_create_semaphore.go +++ b/network/mhfpacket/msg_sys_create_semaphore.go @@ -4,9 +4,9 @@ import ( "errors" _config "erupe-ce/config" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysCreateSemaphore represents the MSG_SYS_CREATE_SEMAPHORE diff --git a/network/mhfpacket/msg_sys_create_stage.go b/network/mhfpacket/msg_sys_create_stage.go index 9c11ba46c..80fbbe6bd 100644 --- a/network/mhfpacket/msg_sys_create_stage.go +++ b/network/mhfpacket/msg_sys_create_stage.go @@ -2,9 +2,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysCreateStage represents the MSG_SYS_CREATE_STAGE diff --git a/network/mhfpacket/msg_sys_del_object.go b/network/mhfpacket/msg_sys_del_object.go index 3a976d71d..3d549eed0 100644 --- a/network/mhfpacket/msg_sys_del_object.go +++ b/network/mhfpacket/msg_sys_del_object.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysDelObject represents the MSG_SYS_DEL_OBJECT diff --git a/network/mhfpacket/msg_sys_delete_mutex.go b/network/mhfpacket/msg_sys_delete_mutex.go index 54237c13c..0df07f402 100644 --- a/network/mhfpacket/msg_sys_delete_mutex.go +++ b/network/mhfpacket/msg_sys_delete_mutex.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysDeleteMutex represents the MSG_SYS_DELETE_MUTEX diff --git a/network/mhfpacket/msg_sys_delete_object.go b/network/mhfpacket/msg_sys_delete_object.go index 34697ab5b..11f8e43be 100644 --- a/network/mhfpacket/msg_sys_delete_object.go +++ b/network/mhfpacket/msg_sys_delete_object.go @@ -3,7 +3,7 @@ package mhfpacket import ( "erupe-ce/network" "erupe-ce/network/clientctx" - "erupe-ce/common/byteframe" + "erupe-ce/utils/byteframe" ) // MsgSysDeleteObject represents the MSG_SYS_DELETE_OBJECT diff --git a/network/mhfpacket/msg_sys_delete_semaphore.go b/network/mhfpacket/msg_sys_delete_semaphore.go index d10148cf6..6cea8748a 100644 --- a/network/mhfpacket/msg_sys_delete_semaphore.go +++ b/network/mhfpacket/msg_sys_delete_semaphore.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysDeleteSemaphore represents the MSG_SYS_DELETE_SEMAPHORE diff --git a/network/mhfpacket/msg_sys_delete_user.go b/network/mhfpacket/msg_sys_delete_user.go index 2ae1f99a5..06661fdbd 100644 --- a/network/mhfpacket/msg_sys_delete_user.go +++ b/network/mhfpacket/msg_sys_delete_user.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysDeleteUser represents the MSG_SYS_DELETE_USER diff --git a/network/mhfpacket/msg_sys_disp_object.go b/network/mhfpacket/msg_sys_disp_object.go index 6360c5316..9259efc1b 100644 --- a/network/mhfpacket/msg_sys_disp_object.go +++ b/network/mhfpacket/msg_sys_disp_object.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysDispObject represents the MSG_SYS_DISP_OBJECT diff --git a/network/mhfpacket/msg_sys_duplicate_object.go b/network/mhfpacket/msg_sys_duplicate_object.go index 559250876..a818ec816 100644 --- a/network/mhfpacket/msg_sys_duplicate_object.go +++ b/network/mhfpacket/msg_sys_duplicate_object.go @@ -3,7 +3,7 @@ package mhfpacket import ( "erupe-ce/network" "erupe-ce/network/clientctx" - "erupe-ce/common/byteframe" + "erupe-ce/utils/byteframe" ) // MsgSysDuplicateObject represents the MSG_SYS_DUPLICATE_OBJECT diff --git a/network/mhfpacket/msg_sys_echo.go b/network/mhfpacket/msg_sys_echo.go index 01bb3e840..880476d02 100644 --- a/network/mhfpacket/msg_sys_echo.go +++ b/network/mhfpacket/msg_sys_echo.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysEcho represents the MSG_SYS_ECHO diff --git a/network/mhfpacket/msg_sys_end.go b/network/mhfpacket/msg_sys_end.go index bb89cfdb5..09a9a387a 100644 --- a/network/mhfpacket/msg_sys_end.go +++ b/network/mhfpacket/msg_sys_end.go @@ -3,7 +3,7 @@ package mhfpacket import ( "erupe-ce/network" "erupe-ce/network/clientctx" - "erupe-ce/common/byteframe" + "erupe-ce/utils/byteframe" ) // MsgSysEnd represents the MSG_SYS_END diff --git a/network/mhfpacket/msg_sys_enter_stage.go b/network/mhfpacket/msg_sys_enter_stage.go index 17ba468f2..b84d80ff6 100644 --- a/network/mhfpacket/msg_sys_enter_stage.go +++ b/network/mhfpacket/msg_sys_enter_stage.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysEnterStage represents the MSG_SYS_ENTER_STAGE diff --git a/network/mhfpacket/msg_sys_enumerate_client.go b/network/mhfpacket/msg_sys_enumerate_client.go index 06764d65b..d7bf13916 100644 --- a/network/mhfpacket/msg_sys_enumerate_client.go +++ b/network/mhfpacket/msg_sys_enumerate_client.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysEnumerateClient represents the MSG_SYS_ENUMERATE_CLIENT diff --git a/network/mhfpacket/msg_sys_enumerate_stage.go b/network/mhfpacket/msg_sys_enumerate_stage.go index b0d25c099..1c977a191 100644 --- a/network/mhfpacket/msg_sys_enumerate_stage.go +++ b/network/mhfpacket/msg_sys_enumerate_stage.go @@ -2,9 +2,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysEnumerateStage represents the MSG_SYS_ENUMERATE_STAGE diff --git a/network/mhfpacket/msg_sys_enumlobby.go b/network/mhfpacket/msg_sys_enumlobby.go index 7517b538c..1c7e949b0 100644 --- a/network/mhfpacket/msg_sys_enumlobby.go +++ b/network/mhfpacket/msg_sys_enumlobby.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysEnumlobby represents the MSG_SYS_ENUMLOBBY diff --git a/network/mhfpacket/msg_sys_enumuser.go b/network/mhfpacket/msg_sys_enumuser.go index c4814c4ed..98f412b0d 100644 --- a/network/mhfpacket/msg_sys_enumuser.go +++ b/network/mhfpacket/msg_sys_enumuser.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysEnumuser represents the MSG_SYS_ENUMUSER diff --git a/network/mhfpacket/msg_sys_extend_threshold.go b/network/mhfpacket/msg_sys_extend_threshold.go index fe44d7d55..2e1a6491f 100644 --- a/network/mhfpacket/msg_sys_extend_threshold.go +++ b/network/mhfpacket/msg_sys_extend_threshold.go @@ -3,7 +3,7 @@ package mhfpacket import ( "erupe-ce/network" "erupe-ce/network/clientctx" - "erupe-ce/common/byteframe" + "erupe-ce/utils/byteframe" ) // MsgSysExtendThreshold represents the MSG_SYS_EXTEND_THRESHOLD diff --git a/network/mhfpacket/msg_sys_get_file.go b/network/mhfpacket/msg_sys_get_file.go index 99af6aa5e..71ef8d57c 100644 --- a/network/mhfpacket/msg_sys_get_file.go +++ b/network/mhfpacket/msg_sys_get_file.go @@ -3,10 +3,10 @@ package mhfpacket import ( "errors" - "erupe-ce/common/bfutil" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/bfutil" + "erupe-ce/utils/byteframe" ) type scenarioFileIdentifer struct { diff --git a/network/mhfpacket/msg_sys_get_object_binary.go b/network/mhfpacket/msg_sys_get_object_binary.go index 72196c36a..44da50c48 100644 --- a/network/mhfpacket/msg_sys_get_object_binary.go +++ b/network/mhfpacket/msg_sys_get_object_binary.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysGetObjectBinary represents the MSG_SYS_GET_OBJECT_BINARY diff --git a/network/mhfpacket/msg_sys_get_object_owner.go b/network/mhfpacket/msg_sys_get_object_owner.go index ca91f2171..1258ccb50 100644 --- a/network/mhfpacket/msg_sys_get_object_owner.go +++ b/network/mhfpacket/msg_sys_get_object_owner.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysGetObjectOwner represents the MSG_SYS_GET_OBJECT_OWNER diff --git a/network/mhfpacket/msg_sys_get_stage_binary.go b/network/mhfpacket/msg_sys_get_stage_binary.go index c2da50122..642932c84 100644 --- a/network/mhfpacket/msg_sys_get_stage_binary.go +++ b/network/mhfpacket/msg_sys_get_stage_binary.go @@ -1,9 +1,9 @@ package mhfpacket import ( - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysGetStageBinary represents the MSG_SYS_GET_STAGE_BINARY diff --git a/network/mhfpacket/msg_sys_get_state.go b/network/mhfpacket/msg_sys_get_state.go index 75562b285..64c46aaf9 100644 --- a/network/mhfpacket/msg_sys_get_state.go +++ b/network/mhfpacket/msg_sys_get_state.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysGetState represents the MSG_SYS_GET_STATE diff --git a/network/mhfpacket/msg_sys_get_user_binary.go b/network/mhfpacket/msg_sys_get_user_binary.go index 4250c9749..ebe538b65 100644 --- a/network/mhfpacket/msg_sys_get_user_binary.go +++ b/network/mhfpacket/msg_sys_get_user_binary.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysGetUserBinary represents the MSG_SYS_GET_USER_BINARY diff --git a/network/mhfpacket/msg_sys_hide_client.go b/network/mhfpacket/msg_sys_hide_client.go index a2c714a41..dbf3edae2 100644 --- a/network/mhfpacket/msg_sys_hide_client.go +++ b/network/mhfpacket/msg_sys_hide_client.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysHideClient represents the MSG_SYS_HIDE_CLIENT diff --git a/network/mhfpacket/msg_sys_hide_object.go b/network/mhfpacket/msg_sys_hide_object.go index 7a5de7d8f..bbafea73c 100644 --- a/network/mhfpacket/msg_sys_hide_object.go +++ b/network/mhfpacket/msg_sys_hide_object.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysHideObject represents the MSG_SYS_HIDE_OBJECT diff --git a/network/mhfpacket/msg_sys_infokyserver.go b/network/mhfpacket/msg_sys_infokyserver.go index ecaaf4fea..bed0cdbc3 100644 --- a/network/mhfpacket/msg_sys_infokyserver.go +++ b/network/mhfpacket/msg_sys_infokyserver.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysInfokyserver represents the MSG_SYS_INFOKYSERVER diff --git a/network/mhfpacket/msg_sys_insert_user.go b/network/mhfpacket/msg_sys_insert_user.go index 59b834ddb..4a1136e2a 100644 --- a/network/mhfpacket/msg_sys_insert_user.go +++ b/network/mhfpacket/msg_sys_insert_user.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysInsertUser represents the MSG_SYS_INSERT_USER diff --git a/network/mhfpacket/msg_sys_issue_logkey.go b/network/mhfpacket/msg_sys_issue_logkey.go index d5bb6522d..c2aaf05c6 100644 --- a/network/mhfpacket/msg_sys_issue_logkey.go +++ b/network/mhfpacket/msg_sys_issue_logkey.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysIssueLogkey represents the MSG_SYS_ISSUE_LOGKEY diff --git a/network/mhfpacket/msg_sys_leave_stage.go b/network/mhfpacket/msg_sys_leave_stage.go index c9a286d49..b601aba6f 100644 --- a/network/mhfpacket/msg_sys_leave_stage.go +++ b/network/mhfpacket/msg_sys_leave_stage.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysLeaveStage represents the MSG_SYS_LEAVE_STAGE diff --git a/network/mhfpacket/msg_sys_load_register.go b/network/mhfpacket/msg_sys_load_register.go index edf4eafb4..513f77fb7 100644 --- a/network/mhfpacket/msg_sys_load_register.go +++ b/network/mhfpacket/msg_sys_load_register.go @@ -2,9 +2,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysLoadRegister represents the MSG_SYS_LOAD_REGISTER diff --git a/network/mhfpacket/msg_sys_lock_global_sema.go b/network/mhfpacket/msg_sys_lock_global_sema.go index bda48e853..2b0ac4e52 100644 --- a/network/mhfpacket/msg_sys_lock_global_sema.go +++ b/network/mhfpacket/msg_sys_lock_global_sema.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysLockGlobalSema represents the MSG_SYS_LOCK_GLOBAL_SEMA diff --git a/network/mhfpacket/msg_sys_lock_stage.go b/network/mhfpacket/msg_sys_lock_stage.go index 13867b825..deeb20077 100644 --- a/network/mhfpacket/msg_sys_lock_stage.go +++ b/network/mhfpacket/msg_sys_lock_stage.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysLockStage represents the MSG_SYS_LOCK_STAGE diff --git a/network/mhfpacket/msg_sys_login.go b/network/mhfpacket/msg_sys_login.go index 5f8a7c7cc..26f3b0617 100644 --- a/network/mhfpacket/msg_sys_login.go +++ b/network/mhfpacket/msg_sys_login.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysLogin represents the MSG_SYS_LOGIN diff --git a/network/mhfpacket/msg_sys_logout.go b/network/mhfpacket/msg_sys_logout.go index 4d99453fd..093b02da1 100644 --- a/network/mhfpacket/msg_sys_logout.go +++ b/network/mhfpacket/msg_sys_logout.go @@ -3,7 +3,7 @@ package mhfpacket import ( "erupe-ce/network" "erupe-ce/network/clientctx" - "erupe-ce/common/byteframe" + "erupe-ce/utils/byteframe" ) // MsgSysLogout represents the MSG_SYS_LOGOUT diff --git a/network/mhfpacket/msg_sys_move_stage.go b/network/mhfpacket/msg_sys_move_stage.go index 25d767da8..663012cc4 100644 --- a/network/mhfpacket/msg_sys_move_stage.go +++ b/network/mhfpacket/msg_sys_move_stage.go @@ -1,10 +1,10 @@ package mhfpacket import ( - "erupe-ce/common/byteframe" - "erupe-ce/common/bfutil" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/bfutil" + "erupe-ce/utils/byteframe" ) // MsgSysMoveStage represents the MSG_SYS_MOVE_STAGE diff --git a/network/mhfpacket/msg_sys_nop.go b/network/mhfpacket/msg_sys_nop.go index aebc0bab4..a23711752 100644 --- a/network/mhfpacket/msg_sys_nop.go +++ b/network/mhfpacket/msg_sys_nop.go @@ -3,7 +3,7 @@ package mhfpacket import ( "erupe-ce/network" "erupe-ce/network/clientctx" - "erupe-ce/common/byteframe" + "erupe-ce/utils/byteframe" ) // MsgSysNop represents the MSG_SYS_NOP diff --git a/network/mhfpacket/msg_sys_notify_register.go b/network/mhfpacket/msg_sys_notify_register.go index e5b608f1e..d8266724d 100644 --- a/network/mhfpacket/msg_sys_notify_register.go +++ b/network/mhfpacket/msg_sys_notify_register.go @@ -1,9 +1,9 @@ package mhfpacket import ( - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysNotifyRegister represents the MSG_SYS_NOTIFY_REGISTER diff --git a/network/mhfpacket/msg_sys_notify_user_binary.go b/network/mhfpacket/msg_sys_notify_user_binary.go index 4834804db..0ebec675c 100644 --- a/network/mhfpacket/msg_sys_notify_user_binary.go +++ b/network/mhfpacket/msg_sys_notify_user_binary.go @@ -3,7 +3,7 @@ package mhfpacket import ( "erupe-ce/network" "erupe-ce/network/clientctx" - "erupe-ce/common/byteframe" + "erupe-ce/utils/byteframe" ) // MsgSysNotifyUserBinary represents the MSG_SYS_NOTIFY_USER_BINARY diff --git a/network/mhfpacket/msg_sys_open_mutex.go b/network/mhfpacket/msg_sys_open_mutex.go index 04a8267a5..a55ce5f65 100644 --- a/network/mhfpacket/msg_sys_open_mutex.go +++ b/network/mhfpacket/msg_sys_open_mutex.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysOpenMutex represents the MSG_SYS_OPEN_MUTEX diff --git a/network/mhfpacket/msg_sys_operate_register.go b/network/mhfpacket/msg_sys_operate_register.go index 75946d340..a201d3141 100644 --- a/network/mhfpacket/msg_sys_operate_register.go +++ b/network/mhfpacket/msg_sys_operate_register.go @@ -2,9 +2,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysOperateRegister represents the MSG_SYS_OPERATE_REGISTER diff --git a/network/mhfpacket/msg_sys_ping.go b/network/mhfpacket/msg_sys_ping.go index e285520f7..f1c4d9594 100644 --- a/network/mhfpacket/msg_sys_ping.go +++ b/network/mhfpacket/msg_sys_ping.go @@ -3,7 +3,7 @@ package mhfpacket import ( "erupe-ce/network" "erupe-ce/network/clientctx" - "erupe-ce/common/byteframe" + "erupe-ce/utils/byteframe" ) // MsgSysPing represents the MSG_SYS_PING diff --git a/network/mhfpacket/msg_sys_position_object.go b/network/mhfpacket/msg_sys_position_object.go index b58b01648..dab97924b 100644 --- a/network/mhfpacket/msg_sys_position_object.go +++ b/network/mhfpacket/msg_sys_position_object.go @@ -3,7 +3,7 @@ package mhfpacket import ( "erupe-ce/network" "erupe-ce/network/clientctx" - "erupe-ce/common/byteframe" + "erupe-ce/utils/byteframe" ) // MsgSysPositionObject represents the MSG_SYS_POSITION_OBJECT diff --git a/network/mhfpacket/msg_sys_record_log.go b/network/mhfpacket/msg_sys_record_log.go index dcdf3e5a2..c6cbb75f0 100644 --- a/network/mhfpacket/msg_sys_record_log.go +++ b/network/mhfpacket/msg_sys_record_log.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysRecordLog represents the MSG_SYS_RECORD_LOG diff --git a/network/mhfpacket/msg_sys_release_semaphore.go b/network/mhfpacket/msg_sys_release_semaphore.go index ae654cb70..a9a3f89af 100644 --- a/network/mhfpacket/msg_sys_release_semaphore.go +++ b/network/mhfpacket/msg_sys_release_semaphore.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReleaseSemaphore represents the MSG_SYS_RELEASE_SEMAPHORE diff --git a/network/mhfpacket/msg_sys_reserve01.go b/network/mhfpacket/msg_sys_reserve01.go index 81c392b76..84704a2af 100644 --- a/network/mhfpacket/msg_sys_reserve01.go +++ b/network/mhfpacket/msg_sys_reserve01.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve01 represents the MSG_SYS_reserve01 diff --git a/network/mhfpacket/msg_sys_reserve02.go b/network/mhfpacket/msg_sys_reserve02.go index 4140928dc..8d3a157fc 100644 --- a/network/mhfpacket/msg_sys_reserve02.go +++ b/network/mhfpacket/msg_sys_reserve02.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve02 represents the MSG_SYS_reserve02 diff --git a/network/mhfpacket/msg_sys_reserve03.go b/network/mhfpacket/msg_sys_reserve03.go index 5b4fb3d18..6e6fb85b8 100644 --- a/network/mhfpacket/msg_sys_reserve03.go +++ b/network/mhfpacket/msg_sys_reserve03.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve03 represents the MSG_SYS_reserve03 diff --git a/network/mhfpacket/msg_sys_reserve04.go b/network/mhfpacket/msg_sys_reserve04.go index b8c05a850..5ab0c5879 100644 --- a/network/mhfpacket/msg_sys_reserve04.go +++ b/network/mhfpacket/msg_sys_reserve04.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve04 represents the MSG_SYS_reserve04 diff --git a/network/mhfpacket/msg_sys_reserve05.go b/network/mhfpacket/msg_sys_reserve05.go index cab58a1b5..21eed5af4 100644 --- a/network/mhfpacket/msg_sys_reserve05.go +++ b/network/mhfpacket/msg_sys_reserve05.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve05 represents the MSG_SYS_reserve05 diff --git a/network/mhfpacket/msg_sys_reserve06.go b/network/mhfpacket/msg_sys_reserve06.go index 69b3a8ae2..27da7e70a 100644 --- a/network/mhfpacket/msg_sys_reserve06.go +++ b/network/mhfpacket/msg_sys_reserve06.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve06 represents the MSG_SYS_reserve06 diff --git a/network/mhfpacket/msg_sys_reserve07.go b/network/mhfpacket/msg_sys_reserve07.go index d904e673f..68888e80d 100644 --- a/network/mhfpacket/msg_sys_reserve07.go +++ b/network/mhfpacket/msg_sys_reserve07.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve07 represents the MSG_SYS_reserve07 diff --git a/network/mhfpacket/msg_sys_reserve0c.go b/network/mhfpacket/msg_sys_reserve0c.go index 155bdb43e..78a249241 100644 --- a/network/mhfpacket/msg_sys_reserve0c.go +++ b/network/mhfpacket/msg_sys_reserve0c.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve0C represents the MSG_SYS_reserve0C diff --git a/network/mhfpacket/msg_sys_reserve0d.go b/network/mhfpacket/msg_sys_reserve0d.go index 26f8d9ad2..2fc30784e 100644 --- a/network/mhfpacket/msg_sys_reserve0d.go +++ b/network/mhfpacket/msg_sys_reserve0d.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve0D represents the MSG_SYS_reserve0D diff --git a/network/mhfpacket/msg_sys_reserve0e.go b/network/mhfpacket/msg_sys_reserve0e.go index d0485df4f..bce876041 100644 --- a/network/mhfpacket/msg_sys_reserve0e.go +++ b/network/mhfpacket/msg_sys_reserve0e.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve0E represents the MSG_SYS_reserve0E diff --git a/network/mhfpacket/msg_sys_reserve180.go b/network/mhfpacket/msg_sys_reserve180.go index c8ba5dd25..31a11bcd8 100644 --- a/network/mhfpacket/msg_sys_reserve180.go +++ b/network/mhfpacket/msg_sys_reserve180.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve180 represents the MSG_SYS_reserve180 diff --git a/network/mhfpacket/msg_sys_reserve188.go b/network/mhfpacket/msg_sys_reserve188.go index fdeebb6c9..d671f216f 100644 --- a/network/mhfpacket/msg_sys_reserve188.go +++ b/network/mhfpacket/msg_sys_reserve188.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve188 represents the MSG_SYS_reserve188 diff --git a/network/mhfpacket/msg_sys_reserve18b.go b/network/mhfpacket/msg_sys_reserve18b.go index 9c92aa0a0..176e6bdd6 100644 --- a/network/mhfpacket/msg_sys_reserve18b.go +++ b/network/mhfpacket/msg_sys_reserve18b.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve18B represents the MSG_SYS_reserve18B diff --git a/network/mhfpacket/msg_sys_reserve18e.go b/network/mhfpacket/msg_sys_reserve18e.go index 52b58ec08..ff8a0baae 100644 --- a/network/mhfpacket/msg_sys_reserve18e.go +++ b/network/mhfpacket/msg_sys_reserve18e.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve18E represents the MSG_SYS_reserve18E diff --git a/network/mhfpacket/msg_sys_reserve18f.go b/network/mhfpacket/msg_sys_reserve18f.go index 031e2b23b..9d73f92a6 100644 --- a/network/mhfpacket/msg_sys_reserve18f.go +++ b/network/mhfpacket/msg_sys_reserve18f.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve18F represents the MSG_SYS_reserve18F diff --git a/network/mhfpacket/msg_sys_reserve192.go b/network/mhfpacket/msg_sys_reserve192.go index 5df369b67..9c64a1675 100644 --- a/network/mhfpacket/msg_sys_reserve192.go +++ b/network/mhfpacket/msg_sys_reserve192.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve192 represents the MSG_SYS_reserve192 diff --git a/network/mhfpacket/msg_sys_reserve193.go b/network/mhfpacket/msg_sys_reserve193.go index 59137ba1b..2bfa69c44 100644 --- a/network/mhfpacket/msg_sys_reserve193.go +++ b/network/mhfpacket/msg_sys_reserve193.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve193 represents the MSG_SYS_reserve193 diff --git a/network/mhfpacket/msg_sys_reserve194.go b/network/mhfpacket/msg_sys_reserve194.go index e941cf243..4d650e58a 100644 --- a/network/mhfpacket/msg_sys_reserve194.go +++ b/network/mhfpacket/msg_sys_reserve194.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve194 represents the MSG_SYS_reserve194 diff --git a/network/mhfpacket/msg_sys_reserve19b.go b/network/mhfpacket/msg_sys_reserve19b.go index fd8d6a563..7a7973d2b 100644 --- a/network/mhfpacket/msg_sys_reserve19b.go +++ b/network/mhfpacket/msg_sys_reserve19b.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve19B represents the MSG_SYS_reserve19B diff --git a/network/mhfpacket/msg_sys_reserve19e.go b/network/mhfpacket/msg_sys_reserve19e.go index 932563d9f..ed182dab2 100644 --- a/network/mhfpacket/msg_sys_reserve19e.go +++ b/network/mhfpacket/msg_sys_reserve19e.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve19E represents the MSG_SYS_reserve19E diff --git a/network/mhfpacket/msg_sys_reserve19f.go b/network/mhfpacket/msg_sys_reserve19f.go index 5e078ddfb..aa74bfc2b 100644 --- a/network/mhfpacket/msg_sys_reserve19f.go +++ b/network/mhfpacket/msg_sys_reserve19f.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve19F represents the MSG_SYS_reserve19F diff --git a/network/mhfpacket/msg_sys_reserve1a4.go b/network/mhfpacket/msg_sys_reserve1a4.go index dd0d1d380..495c16f4c 100644 --- a/network/mhfpacket/msg_sys_reserve1a4.go +++ b/network/mhfpacket/msg_sys_reserve1a4.go @@ -1,11 +1,11 @@ package mhfpacket import ( - "errors" + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve1A4 represents the MSG_SYS_reserve1A4 diff --git a/network/mhfpacket/msg_sys_reserve1a6.go b/network/mhfpacket/msg_sys_reserve1a6.go index c98bc746b..d85a2f7c1 100644 --- a/network/mhfpacket/msg_sys_reserve1a6.go +++ b/network/mhfpacket/msg_sys_reserve1a6.go @@ -1,11 +1,11 @@ package mhfpacket import ( - "errors" + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve1A6 represents the MSG_SYS_reserve1A6 diff --git a/network/mhfpacket/msg_sys_reserve1a7.go b/network/mhfpacket/msg_sys_reserve1a7.go index 3bf255cb4..f9431f32b 100644 --- a/network/mhfpacket/msg_sys_reserve1a7.go +++ b/network/mhfpacket/msg_sys_reserve1a7.go @@ -1,11 +1,11 @@ package mhfpacket import ( - "errors" + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve1A7 represents the MSG_SYS_reserve1A7 diff --git a/network/mhfpacket/msg_sys_reserve1a8.go b/network/mhfpacket/msg_sys_reserve1a8.go index 4301f81e5..014644bf5 100644 --- a/network/mhfpacket/msg_sys_reserve1a8.go +++ b/network/mhfpacket/msg_sys_reserve1a8.go @@ -1,11 +1,11 @@ package mhfpacket import ( - "errors" + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve1A8 represents the MSG_SYS_reserve1A8 diff --git a/network/mhfpacket/msg_sys_reserve1a9.go b/network/mhfpacket/msg_sys_reserve1a9.go index df9cb7bc1..fc74eb396 100644 --- a/network/mhfpacket/msg_sys_reserve1a9.go +++ b/network/mhfpacket/msg_sys_reserve1a9.go @@ -1,11 +1,11 @@ package mhfpacket import ( - "errors" + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve1A9 represents the MSG_SYS_reserve1A9 diff --git a/network/mhfpacket/msg_sys_reserve1aa.go b/network/mhfpacket/msg_sys_reserve1aa.go index 786b0dc9a..0b5150d18 100644 --- a/network/mhfpacket/msg_sys_reserve1aa.go +++ b/network/mhfpacket/msg_sys_reserve1aa.go @@ -1,11 +1,11 @@ package mhfpacket import ( - "errors" + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve1AA represents the MSG_SYS_reserve1AA diff --git a/network/mhfpacket/msg_sys_reserve1ab.go b/network/mhfpacket/msg_sys_reserve1ab.go index 2e06039bd..1e1e70c9a 100644 --- a/network/mhfpacket/msg_sys_reserve1ab.go +++ b/network/mhfpacket/msg_sys_reserve1ab.go @@ -1,11 +1,11 @@ package mhfpacket import ( - "errors" + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve1AB represents the MSG_SYS_reserve1AB diff --git a/network/mhfpacket/msg_sys_reserve1ac.go b/network/mhfpacket/msg_sys_reserve1ac.go index 9983f9b77..658e4e43d 100644 --- a/network/mhfpacket/msg_sys_reserve1ac.go +++ b/network/mhfpacket/msg_sys_reserve1ac.go @@ -1,11 +1,11 @@ package mhfpacket import ( - "errors" + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve1AC represents the MSG_SYS_reserve1AC diff --git a/network/mhfpacket/msg_sys_reserve1ad.go b/network/mhfpacket/msg_sys_reserve1ad.go index 93b2e3c59..1b7040165 100644 --- a/network/mhfpacket/msg_sys_reserve1ad.go +++ b/network/mhfpacket/msg_sys_reserve1ad.go @@ -1,11 +1,11 @@ package mhfpacket import ( - "errors" + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve1AD represents the MSG_SYS_reserve1AD diff --git a/network/mhfpacket/msg_sys_reserve1ae.go b/network/mhfpacket/msg_sys_reserve1ae.go index 66a4d2303..8f58e4dfd 100644 --- a/network/mhfpacket/msg_sys_reserve1ae.go +++ b/network/mhfpacket/msg_sys_reserve1ae.go @@ -1,11 +1,11 @@ package mhfpacket import ( - "errors" + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve1AE represents the MSG_SYS_reserve1AE diff --git a/network/mhfpacket/msg_sys_reserve1af.go b/network/mhfpacket/msg_sys_reserve1af.go index fc57f5a20..a1c2dc758 100644 --- a/network/mhfpacket/msg_sys_reserve1af.go +++ b/network/mhfpacket/msg_sys_reserve1af.go @@ -1,11 +1,11 @@ package mhfpacket import ( - "errors" + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve1AF represents the MSG_SYS_reserve1AF diff --git a/network/mhfpacket/msg_sys_reserve4a.go b/network/mhfpacket/msg_sys_reserve4a.go index 89ccdb46c..8ddee41ff 100644 --- a/network/mhfpacket/msg_sys_reserve4a.go +++ b/network/mhfpacket/msg_sys_reserve4a.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve4A represents the MSG_SYS_reserve4A diff --git a/network/mhfpacket/msg_sys_reserve4b.go b/network/mhfpacket/msg_sys_reserve4b.go index 7232b9f82..2439762dd 100644 --- a/network/mhfpacket/msg_sys_reserve4b.go +++ b/network/mhfpacket/msg_sys_reserve4b.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve4B represents the MSG_SYS_reserve4B diff --git a/network/mhfpacket/msg_sys_reserve4c.go b/network/mhfpacket/msg_sys_reserve4c.go index 3fba7d323..e27f7ef25 100644 --- a/network/mhfpacket/msg_sys_reserve4c.go +++ b/network/mhfpacket/msg_sys_reserve4c.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve4C represents the MSG_SYS_reserve4C diff --git a/network/mhfpacket/msg_sys_reserve4d.go b/network/mhfpacket/msg_sys_reserve4d.go index 6a043803a..f1f8cb7f9 100644 --- a/network/mhfpacket/msg_sys_reserve4d.go +++ b/network/mhfpacket/msg_sys_reserve4d.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve4D represents the MSG_SYS_reserve4D diff --git a/network/mhfpacket/msg_sys_reserve4e.go b/network/mhfpacket/msg_sys_reserve4e.go index 25c3b9103..92d56ad35 100644 --- a/network/mhfpacket/msg_sys_reserve4e.go +++ b/network/mhfpacket/msg_sys_reserve4e.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve4E represents the MSG_SYS_reserve4E diff --git a/network/mhfpacket/msg_sys_reserve4f.go b/network/mhfpacket/msg_sys_reserve4f.go index df9df2e8d..cff5004fa 100644 --- a/network/mhfpacket/msg_sys_reserve4f.go +++ b/network/mhfpacket/msg_sys_reserve4f.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve4F represents the MSG_SYS_reserve4F diff --git a/network/mhfpacket/msg_sys_reserve55.go b/network/mhfpacket/msg_sys_reserve55.go index 2db117d37..5112cd7e3 100644 --- a/network/mhfpacket/msg_sys_reserve55.go +++ b/network/mhfpacket/msg_sys_reserve55.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve55 represents the MSG_SYS_reserve55 diff --git a/network/mhfpacket/msg_sys_reserve56.go b/network/mhfpacket/msg_sys_reserve56.go index b063ed410..26e57fa87 100644 --- a/network/mhfpacket/msg_sys_reserve56.go +++ b/network/mhfpacket/msg_sys_reserve56.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve56 represents the MSG_SYS_reserve56 diff --git a/network/mhfpacket/msg_sys_reserve57.go b/network/mhfpacket/msg_sys_reserve57.go index 9db35825f..cdb816126 100644 --- a/network/mhfpacket/msg_sys_reserve57.go +++ b/network/mhfpacket/msg_sys_reserve57.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve57 represents the MSG_SYS_reserve57 diff --git a/network/mhfpacket/msg_sys_reserve5c.go b/network/mhfpacket/msg_sys_reserve5c.go index f92078ff4..28b0d59e8 100644 --- a/network/mhfpacket/msg_sys_reserve5c.go +++ b/network/mhfpacket/msg_sys_reserve5c.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve5C represents the MSG_SYS_reserve5C diff --git a/network/mhfpacket/msg_sys_reserve5e.go b/network/mhfpacket/msg_sys_reserve5e.go index ea456b4fb..5c48c314d 100644 --- a/network/mhfpacket/msg_sys_reserve5e.go +++ b/network/mhfpacket/msg_sys_reserve5e.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve5E represents the MSG_SYS_reserve5E diff --git a/network/mhfpacket/msg_sys_reserve5f.go b/network/mhfpacket/msg_sys_reserve5f.go index c67db1df7..afc7abe72 100644 --- a/network/mhfpacket/msg_sys_reserve5f.go +++ b/network/mhfpacket/msg_sys_reserve5f.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve5F represents the MSG_SYS_reserve5F diff --git a/network/mhfpacket/msg_sys_reserve71.go b/network/mhfpacket/msg_sys_reserve71.go index d29e534ab..8354af4a0 100644 --- a/network/mhfpacket/msg_sys_reserve71.go +++ b/network/mhfpacket/msg_sys_reserve71.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve71 represents the MSG_SYS_reserve71 diff --git a/network/mhfpacket/msg_sys_reserve72.go b/network/mhfpacket/msg_sys_reserve72.go index 6e7d47516..9186860b8 100644 --- a/network/mhfpacket/msg_sys_reserve72.go +++ b/network/mhfpacket/msg_sys_reserve72.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve72 represents the MSG_SYS_reserve72 diff --git a/network/mhfpacket/msg_sys_reserve73.go b/network/mhfpacket/msg_sys_reserve73.go index d1f070cd8..24f1b28d7 100644 --- a/network/mhfpacket/msg_sys_reserve73.go +++ b/network/mhfpacket/msg_sys_reserve73.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve73 represents the MSG_SYS_reserve73 diff --git a/network/mhfpacket/msg_sys_reserve74.go b/network/mhfpacket/msg_sys_reserve74.go index 043e51746..ae2578369 100644 --- a/network/mhfpacket/msg_sys_reserve74.go +++ b/network/mhfpacket/msg_sys_reserve74.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve74 represents the MSG_SYS_reserve74 diff --git a/network/mhfpacket/msg_sys_reserve75.go b/network/mhfpacket/msg_sys_reserve75.go index e14d32dcc..05a526688 100644 --- a/network/mhfpacket/msg_sys_reserve75.go +++ b/network/mhfpacket/msg_sys_reserve75.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve75 represents the MSG_SYS_reserve75 diff --git a/network/mhfpacket/msg_sys_reserve76.go b/network/mhfpacket/msg_sys_reserve76.go index 6572dfd40..7aaed51c3 100644 --- a/network/mhfpacket/msg_sys_reserve76.go +++ b/network/mhfpacket/msg_sys_reserve76.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve76 represents the MSG_SYS_reserve76 diff --git a/network/mhfpacket/msg_sys_reserve77.go b/network/mhfpacket/msg_sys_reserve77.go index 4baf553bd..5b47c3402 100644 --- a/network/mhfpacket/msg_sys_reserve77.go +++ b/network/mhfpacket/msg_sys_reserve77.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve77 represents the MSG_SYS_reserve77 diff --git a/network/mhfpacket/msg_sys_reserve78.go b/network/mhfpacket/msg_sys_reserve78.go index 20c940566..4ff3b9d86 100644 --- a/network/mhfpacket/msg_sys_reserve78.go +++ b/network/mhfpacket/msg_sys_reserve78.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve78 represents the MSG_SYS_reserve78 diff --git a/network/mhfpacket/msg_sys_reserve79.go b/network/mhfpacket/msg_sys_reserve79.go index a88ebe71d..0e443e427 100644 --- a/network/mhfpacket/msg_sys_reserve79.go +++ b/network/mhfpacket/msg_sys_reserve79.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve79 represents the MSG_SYS_reserve79 diff --git a/network/mhfpacket/msg_sys_reserve7a.go b/network/mhfpacket/msg_sys_reserve7a.go index 049bd6c2e..cd44943d3 100644 --- a/network/mhfpacket/msg_sys_reserve7a.go +++ b/network/mhfpacket/msg_sys_reserve7a.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve7A represents the MSG_SYS_reserve7A diff --git a/network/mhfpacket/msg_sys_reserve7b.go b/network/mhfpacket/msg_sys_reserve7b.go index 274f4a29d..3f622d6e5 100644 --- a/network/mhfpacket/msg_sys_reserve7b.go +++ b/network/mhfpacket/msg_sys_reserve7b.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve7B represents the MSG_SYS_reserve7B diff --git a/network/mhfpacket/msg_sys_reserve7c.go b/network/mhfpacket/msg_sys_reserve7c.go index d7c490d1c..24cdd30f0 100644 --- a/network/mhfpacket/msg_sys_reserve7c.go +++ b/network/mhfpacket/msg_sys_reserve7c.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve7C represents the MSG_SYS_reserve7C diff --git a/network/mhfpacket/msg_sys_reserve7e.go b/network/mhfpacket/msg_sys_reserve7e.go index 4f0683c8f..d7700ad00 100644 --- a/network/mhfpacket/msg_sys_reserve7e.go +++ b/network/mhfpacket/msg_sys_reserve7e.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserve7E represents the MSG_SYS_reserve7E diff --git a/network/mhfpacket/msg_sys_reserve_stage.go b/network/mhfpacket/msg_sys_reserve_stage.go index d2f688af4..4a8f734cb 100644 --- a/network/mhfpacket/msg_sys_reserve_stage.go +++ b/network/mhfpacket/msg_sys_reserve_stage.go @@ -2,9 +2,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysReserveStage represents the MSG_SYS_RESERVE_STAGE diff --git a/network/mhfpacket/msg_sys_rights_reload.go b/network/mhfpacket/msg_sys_rights_reload.go index a70be8f38..4b0378ce7 100644 --- a/network/mhfpacket/msg_sys_rights_reload.go +++ b/network/mhfpacket/msg_sys_rights_reload.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysRightsReload represents the MSG_SYS_RIGHTS_RELOAD diff --git a/network/mhfpacket/msg_sys_rotate_object.go b/network/mhfpacket/msg_sys_rotate_object.go index b7795ff57..1896e8413 100644 --- a/network/mhfpacket/msg_sys_rotate_object.go +++ b/network/mhfpacket/msg_sys_rotate_object.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysRotateObject represents the MSG_SYS_ROTATE_OBJECT diff --git a/network/mhfpacket/msg_sys_serialize.go b/network/mhfpacket/msg_sys_serialize.go index 5e6f57b9f..dd44f9949 100644 --- a/network/mhfpacket/msg_sys_serialize.go +++ b/network/mhfpacket/msg_sys_serialize.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysSerialize represents the MSG_SYS_SERIALIZE diff --git a/network/mhfpacket/msg_sys_set_object_binary.go b/network/mhfpacket/msg_sys_set_object_binary.go index d34e03008..1dcd95429 100644 --- a/network/mhfpacket/msg_sys_set_object_binary.go +++ b/network/mhfpacket/msg_sys_set_object_binary.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysSetObjectBinary represents the MSG_SYS_SET_OBJECT_BINARY diff --git a/network/mhfpacket/msg_sys_set_stage_binary.go b/network/mhfpacket/msg_sys_set_stage_binary.go index 79832c7bb..153ab0314 100644 --- a/network/mhfpacket/msg_sys_set_stage_binary.go +++ b/network/mhfpacket/msg_sys_set_stage_binary.go @@ -1,9 +1,9 @@ package mhfpacket import ( - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysSetStageBinary represents the MSG_SYS_SET_STAGE_BINARY diff --git a/network/mhfpacket/msg_sys_set_stage_pass.go b/network/mhfpacket/msg_sys_set_stage_pass.go index 1461241b0..1a32f9077 100644 --- a/network/mhfpacket/msg_sys_set_stage_pass.go +++ b/network/mhfpacket/msg_sys_set_stage_pass.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysSetStagePass represents the MSG_SYS_SET_STAGE_PASS diff --git a/network/mhfpacket/msg_sys_set_status.go b/network/mhfpacket/msg_sys_set_status.go index 5b1544d8d..edf3b087e 100644 --- a/network/mhfpacket/msg_sys_set_status.go +++ b/network/mhfpacket/msg_sys_set_status.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysSetStatus represents the MSG_SYS_SET_STATUS diff --git a/network/mhfpacket/msg_sys_set_user_binary.go b/network/mhfpacket/msg_sys_set_user_binary.go index 45da60625..35e5475a1 100644 --- a/network/mhfpacket/msg_sys_set_user_binary.go +++ b/network/mhfpacket/msg_sys_set_user_binary.go @@ -3,9 +3,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysSetUserBinary represents the MSG_SYS_SET_USER_BINARY diff --git a/network/mhfpacket/msg_sys_stage_destruct.go b/network/mhfpacket/msg_sys_stage_destruct.go index 19643af69..98e8e9095 100644 --- a/network/mhfpacket/msg_sys_stage_destruct.go +++ b/network/mhfpacket/msg_sys_stage_destruct.go @@ -3,7 +3,7 @@ package mhfpacket import ( "erupe-ce/network" "erupe-ce/network/clientctx" - "erupe-ce/common/byteframe" + "erupe-ce/utils/byteframe" ) // MsgSysStageDestruct represents the MSG_SYS_STAGE_DESTRUCT diff --git a/network/mhfpacket/msg_sys_terminal_log.go b/network/mhfpacket/msg_sys_terminal_log.go index bad160a73..429cbc97d 100644 --- a/network/mhfpacket/msg_sys_terminal_log.go +++ b/network/mhfpacket/msg_sys_terminal_log.go @@ -4,9 +4,9 @@ import ( "errors" _config "erupe-ce/config" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // TerminalLogEntry represents an entry in the MSG_SYS_TERMINAL_LOG packet. diff --git a/network/mhfpacket/msg_sys_time.go b/network/mhfpacket/msg_sys_time.go index 64c5eacff..4dac55d19 100644 --- a/network/mhfpacket/msg_sys_time.go +++ b/network/mhfpacket/msg_sys_time.go @@ -3,7 +3,7 @@ package mhfpacket import ( "erupe-ce/network" "erupe-ce/network/clientctx" - "erupe-ce/common/byteframe" + "erupe-ce/utils/byteframe" ) // MsgSysTime represents the MSG_SYS_TIME diff --git a/network/mhfpacket/msg_sys_trans_binary.go b/network/mhfpacket/msg_sys_trans_binary.go index ba4a91af8..3ea242f05 100644 --- a/network/mhfpacket/msg_sys_trans_binary.go +++ b/network/mhfpacket/msg_sys_trans_binary.go @@ -1,11 +1,11 @@ package mhfpacket -import ( - "errors" +import ( + "errors" - "erupe-ce/network/clientctx" "erupe-ce/network" - "erupe-ce/common/byteframe" + "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysTransBinary represents the MSG_SYS_TRANS_BINARY diff --git a/network/mhfpacket/msg_sys_unlock_global_sema.go b/network/mhfpacket/msg_sys_unlock_global_sema.go index 35f3acb93..1126ab44d 100644 --- a/network/mhfpacket/msg_sys_unlock_global_sema.go +++ b/network/mhfpacket/msg_sys_unlock_global_sema.go @@ -3,7 +3,7 @@ package mhfpacket import ( "erupe-ce/network" "erupe-ce/network/clientctx" - "erupe-ce/common/byteframe" + "erupe-ce/utils/byteframe" ) // MsgSysUnlockGlobalSema represents the MSG_SYS_UNLOCK_GLOBAL_SEMA diff --git a/network/mhfpacket/msg_sys_unlock_stage.go b/network/mhfpacket/msg_sys_unlock_stage.go index ec1effdc5..adb9c2584 100644 --- a/network/mhfpacket/msg_sys_unlock_stage.go +++ b/network/mhfpacket/msg_sys_unlock_stage.go @@ -2,9 +2,9 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysUnlockStage represents the MSG_SYS_UNLOCK_STAGE diff --git a/network/mhfpacket/msg_sys_unreserve_stage.go b/network/mhfpacket/msg_sys_unreserve_stage.go index a0739366f..3d7d246d1 100644 --- a/network/mhfpacket/msg_sys_unreserve_stage.go +++ b/network/mhfpacket/msg_sys_unreserve_stage.go @@ -3,7 +3,7 @@ package mhfpacket import ( "erupe-ce/network" "erupe-ce/network/clientctx" - "erupe-ce/common/byteframe" + "erupe-ce/utils/byteframe" ) // MsgSysUnreserveStage represents the MSG_SYS_UNRESERVE_STAGE diff --git a/network/mhfpacket/msg_sys_update_object_binary.go b/network/mhfpacket/msg_sys_update_object_binary.go index 4d033d1f4..f384f7c3a 100644 --- a/network/mhfpacket/msg_sys_update_object_binary.go +++ b/network/mhfpacket/msg_sys_update_object_binary.go @@ -3,7 +3,7 @@ package mhfpacket import ( "erupe-ce/network" "erupe-ce/network/clientctx" - "erupe-ce/common/byteframe" + "erupe-ce/utils/byteframe" ) // MsgSysUpdateObjectBinary represents the MSG_SYS_UPDATE_OBJECT_BINARY diff --git a/network/mhfpacket/msg_sys_update_right.go b/network/mhfpacket/msg_sys_update_right.go index c384deece..6d7177e52 100644 --- a/network/mhfpacket/msg_sys_update_right.go +++ b/network/mhfpacket/msg_sys_update_right.go @@ -2,11 +2,11 @@ package mhfpacket import ( "errors" - "erupe-ce/common/byteframe" - "erupe-ce/common/mhfcourse" - ps "erupe-ce/common/pascalstring" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" + "erupe-ce/utils/mhfcourse" + ps "erupe-ce/utils/pascalstring" ) // MsgSysUpdateRight represents the MSG_SYS_UPDATE_RIGHT diff --git a/network/mhfpacket/msg_sys_wait_stage_binary.go b/network/mhfpacket/msg_sys_wait_stage_binary.go index 5127e53de..153285c44 100644 --- a/network/mhfpacket/msg_sys_wait_stage_binary.go +++ b/network/mhfpacket/msg_sys_wait_stage_binary.go @@ -1,9 +1,9 @@ package mhfpacket import ( - "erupe-ce/common/byteframe" "erupe-ce/network" "erupe-ce/network/clientctx" + "erupe-ce/utils/byteframe" ) // MsgSysWaitStageBinary represents the MSG_SYS_WAIT_STAGE_BINARY diff --git a/server/api/dbutils.go b/server/api/dbutils.go index fba1bab5c..349711e6c 100644 --- a/server/api/dbutils.go +++ b/server/api/dbutils.go @@ -3,7 +3,7 @@ package api import ( "context" "database/sql" - "erupe-ce/common/token" + "erupe-ce/utils/token" "fmt" "time" diff --git a/server/api/endpoints.go b/server/api/endpoints.go index 4eaac119e..8d5404088 100644 --- a/server/api/endpoints.go +++ b/server/api/endpoints.go @@ -6,7 +6,7 @@ import ( "encoding/xml" "errors" _config "erupe-ce/config" - "erupe-ce/server/channelserver" + "erupe-ce/utils/gametime" "fmt" "image" "image/jpeg" @@ -77,7 +77,7 @@ type ExportData struct { func (s *APIServer) newAuthData(userID uint32, userRights uint32, userTokenID uint32, userToken string, characters []Character) AuthData { resp := AuthData{ - CurrentTS: uint32(channelserver.TimeAdjusted().Unix()), + CurrentTS: uint32(gametime.TimeAdjusted().Unix()), ExpiryTS: uint32(s.getReturnExpiry(userID).Unix()), EntranceCount: 1, User: User{ @@ -99,9 +99,9 @@ func (s *APIServer) newAuthData(userID uint32, userRights uint32, userTokenID ui stalls[4] = 2 } resp.MezFes = &MezFes{ - ID: uint32(channelserver.TimeWeekStart().Unix()), - Start: uint32(channelserver.TimeWeekStart().Add(-time.Duration(s.erupeConfig.GameplayOptions.MezFesDuration) * time.Second).Unix()), - End: uint32(channelserver.TimeWeekNext().Unix()), + ID: uint32(gametime.TimeWeekStart().Unix()), + Start: uint32(gametime.TimeWeekStart().Add(-time.Duration(s.erupeConfig.GameplayOptions.MezFesDuration) * time.Second).Unix()), + End: uint32(gametime.TimeWeekNext().Unix()), SoloTickets: s.erupeConfig.GameplayOptions.MezFesSoloTickets, GroupTickets: s.erupeConfig.GameplayOptions.MezFesGroupTickets, Stalls: stalls, diff --git a/server/channelserver/handlers.go b/server/channelserver/handlers.go index c0d141f15..aa4d3c4b2 100644 --- a/server/channelserver/handlers.go +++ b/server/channelserver/handlers.go @@ -2,12 +2,13 @@ package channelserver import ( "encoding/binary" - "erupe-ce/common/mhfcourse" - "erupe-ce/common/mhfitem" - "erupe-ce/common/mhfmon" - ps "erupe-ce/common/pascalstring" - "erupe-ce/common/stringsupport" _config "erupe-ce/config" + "erupe-ce/utils/gametime" + "erupe-ce/utils/mhfcourse" + "erupe-ce/utils/mhfitem" + "erupe-ce/utils/mhfmon" + ps "erupe-ce/utils/pascalstring" + "erupe-ce/utils/stringsupport" "fmt" "io" "net" @@ -15,8 +16,8 @@ import ( "time" "crypto/rand" - "erupe-ce/common/byteframe" "erupe-ce/network/mhfpacket" + "erupe-ce/utils/byteframe" "math/bits" "go.uber.org/zap" @@ -144,7 +145,7 @@ func handleMsgSysLogin(s *Session, p mhfpacket.MHFPacket) { s.Unlock() bf := byteframe.NewByteFrame() - bf.WriteUint32(uint32(TimeAdjusted().Unix())) // Unix timestamp + bf.WriteUint32(uint32(gametime.TimeAdjusted().Unix())) // Unix timestamp _, err := s.server.db.Exec("UPDATE servers SET current_players=$1 WHERE server_id=$2", len(s.server.sessions), s.server.ID) if err != nil { @@ -156,7 +157,7 @@ func handleMsgSysLogin(s *Session, p mhfpacket.MHFPacket) { panic(err) } - _, err = s.server.db.Exec("UPDATE characters SET last_login=$1 WHERE id=$2", TimeAdjusted().Unix(), s.charID) + _, err = s.server.db.Exec("UPDATE characters SET last_login=$1 WHERE id=$2", gametime.TimeAdjusted().Unix(), s.charID) if err != nil { panic(err) } @@ -217,7 +218,7 @@ func logoutPlayer(s *Session) { var timePlayed int var sessionTime int _ = s.server.db.QueryRow("SELECT time_played FROM characters WHERE id = $1", s.charID).Scan(&timePlayed) - sessionTime = int(TimeAdjusted().Unix()) - int(s.sessionStart) + sessionTime = int(gametime.TimeAdjusted().Unix()) - int(s.sessionStart) timePlayed += sessionTime var rpGained int @@ -275,7 +276,7 @@ func handleMsgSysPing(s *Session, p mhfpacket.MHFPacket) { func handleMsgSysTime(s *Session, p mhfpacket.MHFPacket) { resp := &mhfpacket.MsgSysTime{ GetRemoteTime: false, - Timestamp: uint32(TimeAdjusted().Unix()), // JP timezone + Timestamp: uint32(gametime.TimeAdjusted().Unix()), // JP timezone } s.QueueSendMHF(resp) s.notifyRavi() @@ -312,7 +313,7 @@ func handleMsgSysRecordLog(s *Session, p mhfpacket.MHFPacket) { for i := 0; i < 176; i++ { val = bf.ReadUint8() if val > 0 && mhfmon.Monsters[i].Large { - s.server.db.Exec(`INSERT INTO kill_logs (character_id, monster, quantity, timestamp) VALUES ($1, $2, $3, $4)`, s.charID, i, val, TimeAdjusted()) + s.server.db.Exec(`INSERT INTO kill_logs (character_id, monster, quantity, timestamp) VALUES ($1, $2, $3, $4)`, s.charID, i, val, gametime.TimeAdjusted()) } } } @@ -855,13 +856,13 @@ func handleMsgMhfCheckWeeklyStamp(s *Session, p mhfpacket.MHFPacket) { var lastCheck time.Time err := s.server.db.QueryRow(fmt.Sprintf("SELECT %s_checked FROM stamps WHERE character_id=$1", pkt.StampType), s.charID).Scan(&lastCheck) if err != nil { - lastCheck = TimeAdjusted() - s.server.db.Exec("INSERT INTO stamps (character_id, hl_checked, ex_checked) VALUES ($1, $2, $2)", s.charID, TimeAdjusted()) + lastCheck = gametime.TimeAdjusted() + s.server.db.Exec("INSERT INTO stamps (character_id, hl_checked, ex_checked) VALUES ($1, $2, $2)", s.charID, gametime.TimeAdjusted()) } else { - s.server.db.Exec(fmt.Sprintf(`UPDATE stamps SET %s_checked=$1 WHERE character_id=$2`, pkt.StampType), TimeAdjusted(), s.charID) + s.server.db.Exec(fmt.Sprintf(`UPDATE stamps SET %s_checked=$1 WHERE character_id=$2`, pkt.StampType), gametime.TimeAdjusted(), s.charID) } - if lastCheck.Before(TimeWeekStart()) { + if lastCheck.Before(gametime.TimeWeekStart()) { s.server.db.Exec(fmt.Sprintf("UPDATE stamps SET %s_total=%s_total+1 WHERE character_id=$1", pkt.StampType, pkt.StampType), s.charID) updated = 1 } @@ -873,7 +874,7 @@ func handleMsgMhfCheckWeeklyStamp(s *Session, p mhfpacket.MHFPacket) { bf.WriteUint16(updated) bf.WriteUint16(0) bf.WriteUint16(0) - bf.WriteUint32(uint32(TimeWeekStart().Unix())) + bf.WriteUint32(uint32(gametime.TimeWeekStart().Unix())) doAckBufSucceed(s, pkt.AckHandle, bf.Data()) } @@ -899,7 +900,7 @@ func handleMsgMhfExchangeWeeklyStamp(s *Session, p mhfpacket.MHFPacket) { bf.WriteUint16(0) bf.WriteUint16(tktStack.Item.ItemID) bf.WriteUint16(tktStack.Quantity) - bf.WriteUint32(uint32(TimeWeekStart().Unix())) + bf.WriteUint32(uint32(gametime.TimeWeekStart().Unix())) doAckBufSucceed(s, pkt.AckHandle, bf.Data()) } @@ -1009,7 +1010,7 @@ func handleMsgMhfGetEtcPoints(s *Session, p mhfpacket.MHFPacket) { var dailyTime time.Time _ = s.server.db.QueryRow("SELECT COALESCE(daily_time, $2) FROM characters WHERE id = $1", s.charID, time.Date(2000, 1, 1, 0, 0, 0, 0, time.UTC)).Scan(&dailyTime) - if TimeAdjusted().After(dailyTime) { + if gametime.TimeAdjusted().After(dailyTime) { s.server.db.Exec("UPDATE characters SET bonus_quests = 0, daily_quests = 0 WHERE id=$1", s.charID) } @@ -1117,8 +1118,8 @@ func handleMsgMhfKickExportForce(s *Session, p mhfpacket.MHFPacket) {} func handleMsgMhfGetEarthStatus(s *Session, p mhfpacket.MHFPacket) { pkt := p.(*mhfpacket.MsgMhfGetEarthStatus) bf := byteframe.NewByteFrame() - bf.WriteUint32(uint32(TimeWeekStart().Unix())) // Start - bf.WriteUint32(uint32(TimeWeekNext().Unix())) // End + bf.WriteUint32(uint32(gametime.TimeWeekStart().Unix())) // Start + bf.WriteUint32(uint32(gametime.TimeWeekNext().Unix())) // End bf.WriteInt32(s.server.erupeConfig.EarthStatus) bf.WriteInt32(s.server.erupeConfig.EarthID) for i, m := range s.server.erupeConfig.EarthMonsters { @@ -1248,9 +1249,9 @@ func handleMsgMhfGetSeibattle(s *Session, p mhfpacket.MHFPacket) { var data []*byteframe.ByteFrame seibattle := Seibattle{ Timetable: []SeibattleTimetable{ - {TimeMidnight(), TimeMidnight().Add(time.Hour * 8)}, - {TimeMidnight().Add(time.Hour * 8), TimeMidnight().Add(time.Hour * 16)}, - {TimeMidnight().Add(time.Hour * 16), TimeMidnight().Add(time.Hour * 24)}, + {gametime.TimeMidnight(), gametime.TimeMidnight().Add(time.Hour * 8)}, + {gametime.TimeMidnight().Add(time.Hour * 8), gametime.TimeMidnight().Add(time.Hour * 16)}, + {gametime.TimeMidnight().Add(time.Hour * 16), gametime.TimeMidnight().Add(time.Hour * 24)}, }, KeyScore: []SeibattleKeyScore{ {0, 0}, diff --git a/server/channelserver/handlers_achievement.go b/server/channelserver/handlers_achievement.go index 5db3853e1..9eb3b992a 100644 --- a/server/channelserver/handlers_achievement.go +++ b/server/channelserver/handlers_achievement.go @@ -1,8 +1,8 @@ package channelserver import ( - "erupe-ce/common/byteframe" "erupe-ce/network/mhfpacket" + "erupe-ce/utils/byteframe" "fmt" "io" ) diff --git a/server/channelserver/handlers_bbs.go b/server/channelserver/handlers_bbs.go index d991ee67a..d350a38f4 100644 --- a/server/channelserver/handlers_bbs.go +++ b/server/channelserver/handlers_bbs.go @@ -1,10 +1,10 @@ package channelserver import ( - "erupe-ce/common/byteframe" - "erupe-ce/common/stringsupport" - "erupe-ce/common/token" "erupe-ce/network/mhfpacket" + "erupe-ce/utils/byteframe" + "erupe-ce/utils/stringsupport" + "erupe-ce/utils/token" ) // Handler BBS handles all the interactions with the for the screenshot sending to bulitin board functionality. For it to work it requires the API to be hosted somehwere. This implementation supports discord. diff --git a/server/channelserver/handlers_cafe.go b/server/channelserver/handlers_cafe.go index 406732371..af972f656 100644 --- a/server/channelserver/handlers_cafe.go +++ b/server/channelserver/handlers_cafe.go @@ -1,15 +1,18 @@ package channelserver import ( - "erupe-ce/common/byteframe" - "erupe-ce/common/mhfcourse" - ps "erupe-ce/common/pascalstring" + "erupe-ce/utils/byteframe" + "erupe-ce/utils/gametime" + "erupe-ce/utils/mhfcourse" + _config "erupe-ce/config" "erupe-ce/network/mhfpacket" + ps "erupe-ce/utils/pascalstring" "fmt" - "go.uber.org/zap" "io" "time" + + "go.uber.org/zap" ) func handleMsgMhfAcquireCafeItem(s *Session, p mhfpacket.MHFPacket) { @@ -39,8 +42,8 @@ func handleMsgMhfUpdateCafepoint(s *Session, p mhfpacket.MHFPacket) { func handleMsgMhfCheckDailyCafepoint(s *Session, p mhfpacket.MHFPacket) { pkt := p.(*mhfpacket.MsgMhfCheckDailyCafepoint) - midday := TimeMidnight().Add(12 * time.Hour) - if TimeAdjusted().After(midday) { + midday := gametime.TimeMidnight().Add(12 * time.Hour) + if gametime.TimeAdjusted().After(midday) { midday = midday.Add(24 * time.Hour) } @@ -76,11 +79,11 @@ func handleMsgMhfGetCafeDuration(s *Session, p mhfpacket.MHFPacket) { var cafeReset time.Time err := s.server.db.QueryRow(`SELECT cafe_reset FROM characters WHERE id=$1`, s.charID).Scan(&cafeReset) if err != nil { - cafeReset = TimeWeekNext() + cafeReset = gametime.TimeWeekNext() s.server.db.Exec(`UPDATE characters SET cafe_reset=$1 WHERE id=$2`, cafeReset, s.charID) } - if TimeAdjusted().After(cafeReset) { - cafeReset = TimeWeekNext() + if gametime.TimeAdjusted().After(cafeReset) { + cafeReset = gametime.TimeWeekNext() s.server.db.Exec(`UPDATE characters SET cafe_time=0, cafe_reset=$1 WHERE id=$2`, cafeReset, s.charID) s.server.db.Exec(`DELETE FROM cafe_accepted WHERE character_id=$1`, s.charID) } @@ -91,7 +94,7 @@ func handleMsgMhfGetCafeDuration(s *Session, p mhfpacket.MHFPacket) { panic(err) } if mhfcourse.CourseExists(30, s.courses) { - cafeTime = uint32(TimeAdjusted().Unix()) - uint32(s.sessionStart) + cafeTime + cafeTime = uint32(gametime.TimeAdjusted().Unix()) - uint32(s.sessionStart) + cafeTime } bf.WriteUint32(cafeTime) if _config.ErupeConfig.RealClientMode >= _config.ZZ { @@ -142,7 +145,7 @@ func handleMsgMhfGetCafeDurationBonusInfo(s *Session, p mhfpacket.MHFPacket) { } resp := byteframe.NewByteFrame() resp.WriteUint32(0) - resp.WriteUint32(uint32(TimeAdjusted().Unix())) + resp.WriteUint32(uint32(gametime.TimeAdjusted().Unix())) resp.WriteUint32(count) resp.WriteBytes(bf.Data()) doAckBufSucceed(s, pkt.AckHandle, resp.Data()) @@ -165,7 +168,7 @@ func handleMsgMhfReceiveCafeDurationBonus(s *Session, p mhfpacket.MHFPacket) { SELECT ch.cafe_time + $2 FROM characters ch WHERE ch.id = $1 - ) >= time_req`, s.charID, TimeAdjusted().Unix()-s.sessionStart) + ) >= time_req`, s.charID, gametime.TimeAdjusted().Unix()-s.sessionStart) if err != nil { doAckBufSucceed(s, pkt.AckHandle, bf.Data()) } else { @@ -222,7 +225,7 @@ func addPointNetcafe(s *Session, p int) error { func handleMsgMhfStartBoostTime(s *Session, p mhfpacket.MHFPacket) { pkt := p.(*mhfpacket.MsgMhfStartBoostTime) bf := byteframe.NewByteFrame() - boostLimit := TimeAdjusted().Add(time.Duration(s.server.erupeConfig.GameplayOptions.BoostTimeDuration) * time.Second) + boostLimit := gametime.TimeAdjusted().Add(time.Duration(s.server.erupeConfig.GameplayOptions.BoostTimeDuration) * time.Second) if s.server.erupeConfig.GameplayOptions.DisableBoostTime { bf.WriteUint32(0) doAckBufSucceed(s, pkt.AckHandle, bf.Data()) @@ -260,7 +263,7 @@ func handleMsgMhfGetBoostRight(s *Session, p mhfpacket.MHFPacket) { doAckBufSucceed(s, pkt.AckHandle, []byte{0x00, 0x00, 0x00, 0x00}) return } - if boostLimit.After(TimeAdjusted()) { + if boostLimit.After(gametime.TimeAdjusted()) { doAckBufSucceed(s, pkt.AckHandle, []byte{0x00, 0x00, 0x00, 0x01}) } else { doAckBufSucceed(s, pkt.AckHandle, []byte{0x00, 0x00, 0x00, 0x02}) diff --git a/server/channelserver/handlers_campaign.go b/server/channelserver/handlers_campaign.go index ed8fc7c3e..b24df38b6 100644 --- a/server/channelserver/handlers_campaign.go +++ b/server/channelserver/handlers_campaign.go @@ -1,11 +1,11 @@ package channelserver import ( - "erupe-ce/common/byteframe" - ps "erupe-ce/common/pascalstring" - "erupe-ce/common/stringsupport" _config "erupe-ce/config" "erupe-ce/network/mhfpacket" + "erupe-ce/utils/byteframe" + ps "erupe-ce/utils/pascalstring" + "erupe-ce/utils/stringsupport" "time" ) diff --git a/server/channelserver/handlers_caravan.go b/server/channelserver/handlers_caravan.go index c90f44812..e5eca75d7 100644 --- a/server/channelserver/handlers_caravan.go +++ b/server/channelserver/handlers_caravan.go @@ -1,9 +1,9 @@ package channelserver import ( - "erupe-ce/common/byteframe" - "erupe-ce/common/stringsupport" "erupe-ce/network/mhfpacket" + "erupe-ce/utils/byteframe" + "erupe-ce/utils/stringsupport" "time" ) diff --git a/server/channelserver/handlers_cast_binary.go b/server/channelserver/handlers_cast_binary.go index 17815dc30..97345e06f 100644 --- a/server/channelserver/handlers_cast_binary.go +++ b/server/channelserver/handlers_cast_binary.go @@ -3,21 +3,22 @@ package channelserver import ( "crypto/rand" "encoding/hex" - "erupe-ce/common/byteframe" - "erupe-ce/common/mhfcid" - "erupe-ce/common/mhfcourse" - "erupe-ce/common/token" - "erupe-ce/config" + _config "erupe-ce/config" "erupe-ce/network" "erupe-ce/network/binpacket" "erupe-ce/network/mhfpacket" + "erupe-ce/utils/byteframe" + "erupe-ce/utils/mhfcid" + "erupe-ce/utils/mhfcourse" + "erupe-ce/utils/token" "fmt" - "golang.org/x/exp/slices" "math" "strconv" "strings" "time" + "golang.org/x/exp/slices" + "go.uber.org/zap" ) diff --git a/server/channelserver/handlers_character.go b/server/channelserver/handlers_character.go index 795fc05e1..237198b80 100644 --- a/server/channelserver/handlers_character.go +++ b/server/channelserver/handlers_character.go @@ -3,12 +3,13 @@ package channelserver import ( "encoding/binary" "errors" - "erupe-ce/common/bfutil" - "erupe-ce/common/stringsupport" _config "erupe-ce/config" + "erupe-ce/utils/bfutil" + "erupe-ce/utils/stringsupport" "erupe-ce/network/mhfpacket" "erupe-ce/server/channelserver/compression/nullcomp" + "go.uber.org/zap" ) diff --git a/server/channelserver/handlers_clients.go b/server/channelserver/handlers_clients.go index 4add1e9eb..162ad9116 100644 --- a/server/channelserver/handlers_clients.go +++ b/server/channelserver/handlers_clients.go @@ -1,9 +1,10 @@ package channelserver import ( - "erupe-ce/common/byteframe" - "erupe-ce/common/stringsupport" "erupe-ce/network/mhfpacket" + "erupe-ce/utils/byteframe" + "erupe-ce/utils/stringsupport" + "go.uber.org/zap" ) diff --git a/server/channelserver/handlers_data.go b/server/channelserver/handlers_data.go index fd41e1366..ad1f6884a 100644 --- a/server/channelserver/handlers_data.go +++ b/server/channelserver/handlers_data.go @@ -1,19 +1,21 @@ package channelserver import ( - "erupe-ce/common/mhfmon" - "erupe-ce/common/stringsupport" _config "erupe-ce/config" + "erupe-ce/utils/gametime" + "erupe-ce/utils/mhfmon" + "erupe-ce/utils/stringsupport" "fmt" "io" "os" "path/filepath" "time" - "erupe-ce/common/byteframe" "erupe-ce/network/mhfpacket" "erupe-ce/server/channelserver/compression/deltacomp" "erupe-ce/server/channelserver/compression/nullcomp" + "erupe-ce/utils/byteframe" + "go.uber.org/zap" ) @@ -1004,7 +1006,7 @@ func handleMsgMhfGetPaperData(s *Session, p mhfpacket.MHFPacket) { switch pkt.Unk2 { case 0: paperMissions = PaperMission{ - []PaperMissionTimetable{{TimeMidnight(), TimeMidnight().Add(24 * time.Hour)}}, + []PaperMissionTimetable{{gametime.TimeMidnight(), gametime.TimeMidnight().Add(24 * time.Hour)}}, []PaperMissionData{}, } case 5: diff --git a/server/channelserver/handlers_distitem.go b/server/channelserver/handlers_distitem.go index 3e2417d34..5ccec0cbc 100644 --- a/server/channelserver/handlers_distitem.go +++ b/server/channelserver/handlers_distitem.go @@ -1,10 +1,10 @@ package channelserver import ( - "erupe-ce/common/byteframe" - ps "erupe-ce/common/pascalstring" _config "erupe-ce/config" "erupe-ce/network/mhfpacket" + "erupe-ce/utils/byteframe" + ps "erupe-ce/utils/pascalstring" "time" "go.uber.org/zap" diff --git a/server/channelserver/handlers_diva.go b/server/channelserver/handlers_diva.go index 7f5b33992..cef2b9840 100644 --- a/server/channelserver/handlers_diva.go +++ b/server/channelserver/handlers_diva.go @@ -2,12 +2,13 @@ package channelserver import ( "encoding/hex" - "erupe-ce/common/stringsupport" _config "erupe-ce/config" + "erupe-ce/utils/gametime" + "erupe-ce/utils/stringsupport" "time" - "erupe-ce/common/byteframe" "erupe-ce/network/mhfpacket" + "erupe-ce/utils/byteframe" ) func cleanupDiva(s *Session) { @@ -16,7 +17,7 @@ func cleanupDiva(s *Session) { func generateDivaTimestamps(s *Session, start uint32, debug bool) []uint32 { timestamps := make([]uint32, 6) - midnight := TimeMidnight() + midnight := gametime.TimeMidnight() if debug && start <= 3 { midnight := uint32(midnight.Unix()) switch start { @@ -44,7 +45,7 @@ func generateDivaTimestamps(s *Session, start uint32, debug bool) []uint32 { } return timestamps } - if start == 0 || TimeAdjusted().Unix() > int64(start)+2977200 { + if start == 0 || gametime.TimeAdjusted().Unix() > int64(start)+2977200 { cleanupDiva(s) // Generate a new diva defense, starting midnight tomorrow start = uint32(midnight.Add(24 * time.Hour).Unix()) diff --git a/server/channelserver/handlers_event.go b/server/channelserver/handlers_event.go index 69a2e0cc2..aff448389 100644 --- a/server/channelserver/handlers_event.go +++ b/server/channelserver/handlers_event.go @@ -1,13 +1,14 @@ package channelserver import ( - "erupe-ce/common/token" _config "erupe-ce/config" + "erupe-ce/utils/gametime" + "erupe-ce/utils/token" "math" "time" - "erupe-ce/common/byteframe" "erupe-ce/network/mhfpacket" + "erupe-ce/utils/byteframe" ) type Event struct { @@ -57,9 +58,9 @@ func handleMsgMhfGetWeeklySchedule(s *Session, p mhfpacket.MHFPacket) { var features []activeFeature times := []time.Time{ - TimeMidnight().Add(-24 * time.Hour), - TimeMidnight(), - TimeMidnight().Add(24 * time.Hour), + gametime.TimeMidnight().Add(-24 * time.Hour), + gametime.TimeMidnight(), + gametime.TimeMidnight().Add(24 * time.Hour), } for _, t := range times { @@ -76,7 +77,7 @@ func handleMsgMhfGetWeeklySchedule(s *Session, p mhfpacket.MHFPacket) { bf := byteframe.NewByteFrame() bf.WriteUint8(uint8(len(features))) - bf.WriteUint32(uint32(TimeAdjusted().Add(-5 * time.Minute).Unix())) + bf.WriteUint32(uint32(gametime.TimeAdjusted().Add(-5 * time.Minute).Unix())) for _, feature := range features { bf.WriteUint32(uint32(feature.StartTime.Unix())) bf.WriteUint32(feature.ActiveFeatures) @@ -146,7 +147,7 @@ func handleMsgMhfGetKeepLoginBoostStatus(s *Session, p mhfpacket.MHFPacket) { loginBoosts = append(loginBoosts, temp) } if len(loginBoosts) == 0 { - temp := TimeWeekStart() + temp := gametime.TimeWeekStart() loginBoosts = []loginBoost{ {WeekReq: 1, Expiration: temp}, {WeekReq: 2, Expiration: temp}, @@ -161,13 +162,13 @@ func handleMsgMhfGetKeepLoginBoostStatus(s *Session, p mhfpacket.MHFPacket) { for _, boost := range loginBoosts { // Reset if next week - if !boost.Reset.IsZero() && boost.Reset.Before(TimeAdjusted()) { - boost.Expiration = TimeWeekStart() + if !boost.Reset.IsZero() && boost.Reset.Before(gametime.TimeAdjusted()) { + boost.Expiration = gametime.TimeWeekStart() boost.Reset = time.Time{} s.server.db.Exec(`UPDATE login_boost SET expiration=$1, reset=$2 WHERE char_id=$3 AND week_req=$4`, boost.Expiration, boost.Reset, s.charID, boost.WeekReq) } - boost.WeekCount = uint8((TimeAdjusted().Unix()-boost.Expiration.Unix())/604800 + 1) + boost.WeekCount = uint8((gametime.TimeAdjusted().Unix()-boost.Expiration.Unix())/604800 + 1) if boost.WeekCount >= boost.WeekReq { boost.Active = true @@ -175,7 +176,7 @@ func handleMsgMhfGetKeepLoginBoostStatus(s *Session, p mhfpacket.MHFPacket) { } // Show reset timer on expired boosts - if boost.Reset.After(TimeAdjusted()) { + if boost.Reset.After(gametime.TimeAdjusted()) { boost.Active = true boost.WeekCount = 0 } @@ -200,14 +201,14 @@ func handleMsgMhfUseKeepLoginBoost(s *Session, p mhfpacket.MHFPacket) { bf.WriteUint8(0) switch pkt.BoostWeekUsed { case 1, 3: - expiration = TimeAdjusted().Add(120 * time.Minute) + expiration = gametime.TimeAdjusted().Add(120 * time.Minute) case 4: - expiration = TimeAdjusted().Add(180 * time.Minute) + expiration = gametime.TimeAdjusted().Add(180 * time.Minute) case 2, 5: - expiration = TimeAdjusted().Add(240 * time.Minute) + expiration = gametime.TimeAdjusted().Add(240 * time.Minute) } bf.WriteUint32(uint32(expiration.Unix())) - s.server.db.Exec(`UPDATE login_boost SET expiration=$1, reset=$2 WHERE char_id=$3 AND week_req=$4`, expiration, TimeWeekNext(), s.charID, pkt.BoostWeekUsed) + s.server.db.Exec(`UPDATE login_boost SET expiration=$1, reset=$2 WHERE char_id=$3 AND week_req=$4`, expiration, gametime.TimeWeekNext(), s.charID, pkt.BoostWeekUsed) doAckBufSucceed(s, pkt.AckHandle, bf.Data()) } diff --git a/server/channelserver/handlers_festa.go b/server/channelserver/handlers_festa.go index d5cba4d90..a20376489 100644 --- a/server/channelserver/handlers_festa.go +++ b/server/channelserver/handlers_festa.go @@ -1,11 +1,12 @@ package channelserver import ( - "erupe-ce/common/byteframe" - ps "erupe-ce/common/pascalstring" - "erupe-ce/common/token" _config "erupe-ce/config" "erupe-ce/network/mhfpacket" + "erupe-ce/utils/byteframe" + "erupe-ce/utils/gametime" + ps "erupe-ce/utils/pascalstring" + "erupe-ce/utils/token" "sort" "time" ) @@ -41,7 +42,7 @@ func handleMsgMhfEnumerateRanking(s *Session, p mhfpacket.MHFPacket) { // Unk // Start? // End? - midnight := TimeMidnight() + midnight := gametime.TimeMidnight() switch state { case 1: bf.WriteUint32(uint32(midnight.Unix())) @@ -60,13 +61,13 @@ func handleMsgMhfEnumerateRanking(s *Session, p mhfpacket.MHFPacket) { bf.WriteUint32(uint32(midnight.Add(7 * 24 * time.Hour).Unix())) default: bf.WriteBytes(make([]byte, 16)) - bf.WriteUint32(uint32(TimeAdjusted().Unix())) // TS Current Time + bf.WriteUint32(uint32(gametime.TimeAdjusted().Unix())) // TS Current Time bf.WriteUint8(3) bf.WriteBytes(make([]byte, 4)) doAckBufSucceed(s, pkt.AckHandle, bf.Data()) return } - bf.WriteUint32(uint32(TimeAdjusted().Unix())) // TS Current Time + bf.WriteUint32(uint32(gametime.TimeAdjusted().Unix())) // TS Current Time bf.WriteUint8(3) ps.Uint8(bf, "", false) bf.WriteUint16(0) // numEvents @@ -102,7 +103,7 @@ func cleanupFesta(s *Session) { func generateFestaTimestamps(s *Session, start uint32, debug bool) []uint32 { timestamps := make([]uint32, 5) - midnight := TimeMidnight() + midnight := gametime.TimeMidnight() if debug && start <= 3 { midnight := uint32(midnight.Unix()) switch start { @@ -127,7 +128,7 @@ func generateFestaTimestamps(s *Session, start uint32, debug bool) []uint32 { } return timestamps } - if start == 0 || TimeAdjusted().Unix() > int64(start)+2977200 { + if start == 0 || gametime.TimeAdjusted().Unix() > int64(start)+2977200 { cleanupFesta(s) // Generate a new festa, starting midnight tomorrow start = uint32(midnight.Add(24 * time.Hour).Unix()) @@ -184,7 +185,7 @@ func handleMsgMhfInfoFesta(s *Session, p mhfpacket.MHFPacket) { timestamps = generateFestaTimestamps(s, start, false) } - if timestamps[0] > uint32(TimeAdjusted().Unix()) { + if timestamps[0] > uint32(gametime.TimeAdjusted().Unix()) { doAckBufSucceed(s, pkt.AckHandle, make([]byte, 4)) return } @@ -197,7 +198,7 @@ func handleMsgMhfInfoFesta(s *Session, p mhfpacket.MHFPacket) { for _, timestamp := range timestamps { bf.WriteUint32(timestamp) } - bf.WriteUint32(uint32(TimeAdjusted().Unix())) + bf.WriteUint32(uint32(gametime.TimeAdjusted().Unix())) bf.WriteUint8(4) ps.Uint8(bf, "", false) bf.WriteUint32(0) diff --git a/server/channelserver/handlers_guild.go b/server/channelserver/handlers_guild.go index 096419137..fe6919ab4 100644 --- a/server/channelserver/handlers_guild.go +++ b/server/channelserver/handlers_guild.go @@ -5,18 +5,20 @@ import ( "database/sql/driver" "encoding/json" "errors" - "erupe-ce/common/mhfitem" _config "erupe-ce/config" + "erupe-ce/utils/gametime" + "erupe-ce/utils/mhfitem" "fmt" "math" "sort" "strings" "time" - "erupe-ce/common/byteframe" - ps "erupe-ce/common/pascalstring" - "erupe-ce/common/stringsupport" "erupe-ce/network/mhfpacket" + "erupe-ce/utils/byteframe" + ps "erupe-ce/utils/pascalstring" + "erupe-ce/utils/stringsupport" + "github.com/jmoiron/sqlx" "go.uber.org/zap" ) @@ -825,7 +827,7 @@ func handleDonateRP(s *Session, amount uint16, guild *Guild, _type int) []byte { case 2: if resetRoom { s.server.db.Exec(`UPDATE guilds SET room_rp = 0 WHERE id = $1`, guild.ID) - s.server.db.Exec(`UPDATE guilds SET room_expiry = $1 WHERE id = $2`, TimeAdjusted().Add(time.Hour*24*7), guild.ID) + s.server.db.Exec(`UPDATE guilds SET room_expiry = $1 WHERE id = $2`, gametime.TimeAdjusted().Add(time.Hour*24*7), guild.ID) } else { s.server.db.Exec(`UPDATE guilds SET room_rp = room_rp + $1 WHERE id = $2`, amount, guild.ID) } @@ -1720,7 +1722,7 @@ func handleMsgMhfGetGuildMissionList(s *Session, p mhfpacket.MHFPacket) { bf.WriteBool(mission.GR) bf.WriteUint16(mission.RewardType) bf.WriteUint16(mission.RewardLevel) - bf.WriteUint32(uint32(TimeAdjusted().Unix())) + bf.WriteUint32(uint32(gametime.TimeAdjusted().Unix())) } doAckBufSucceed(s, pkt.AckHandle, bf.Data()) } @@ -1770,7 +1772,7 @@ func handleMsgMhfLoadGuildCooking(s *Session, p mhfpacket.MHFPacket) { if err != nil { continue } - if temp.CreatedAt.Add(60 * time.Minute).After(TimeAdjusted()) { + if temp.CreatedAt.Add(60 * time.Minute).After(gametime.TimeAdjusted()) { meals = append(meals, temp) } } @@ -1788,7 +1790,7 @@ func handleMsgMhfLoadGuildCooking(s *Session, p mhfpacket.MHFPacket) { func handleMsgMhfRegistGuildCooking(s *Session, p mhfpacket.MHFPacket) { pkt := p.(*mhfpacket.MsgMhfRegistGuildCooking) guild, _ := GetGuildInfoByCharacterId(s, s.charID) - startTime := TimeAdjusted().Add(time.Duration(s.server.erupeConfig.GameplayOptions.ClanMealDuration-3600) * time.Second) + startTime := gametime.TimeAdjusted().Add(time.Duration(s.server.erupeConfig.GameplayOptions.ClanMealDuration-3600) * time.Second) if pkt.OverwriteID != 0 { s.server.db.Exec("UPDATE guild_meals SET meal_id = $1, level = $2, created_at = $3 WHERE id = $4", pkt.MealID, pkt.Success, startTime, pkt.OverwriteID) } else { @@ -1823,7 +1825,7 @@ func handleMsgMhfGuildHuntdata(s *Session, p mhfpacket.MHFPacket) { bf := byteframe.NewByteFrame() switch pkt.Operation { case 0: // Acquire - s.server.db.Exec(`UPDATE guild_characters SET box_claimed=$1 WHERE character_id=$2`, TimeAdjusted(), s.charID) + s.server.db.Exec(`UPDATE guild_characters SET box_claimed=$1 WHERE character_id=$2`, gametime.TimeAdjusted(), s.charID) case 1: // Enumerate bf.WriteUint8(0) // Entries rows, err := s.server.db.Query(`SELECT kl.id, kl.monster FROM kill_logs kl diff --git a/server/channelserver/handlers_guild_adventure.go b/server/channelserver/handlers_guild_adventure.go index 8e953bf24..b8d7e8677 100644 --- a/server/channelserver/handlers_guild_adventure.go +++ b/server/channelserver/handlers_guild_adventure.go @@ -3,9 +3,11 @@ package channelserver import ( "time" - "erupe-ce/common/byteframe" - "erupe-ce/common/stringsupport" "erupe-ce/network/mhfpacket" + "erupe-ce/utils/byteframe" + "erupe-ce/utils/gametime" + "erupe-ce/utils/stringsupport" + "go.uber.org/zap" ) @@ -52,7 +54,7 @@ func handleMsgMhfLoadGuildAdventure(s *Session, p mhfpacket.MHFPacket) { func handleMsgMhfRegistGuildAdventure(s *Session, p mhfpacket.MHFPacket) { pkt := p.(*mhfpacket.MsgMhfRegistGuildAdventure) guild, _ := GetGuildInfoByCharacterId(s, s.charID) - _, err := s.server.db.Exec("INSERT INTO guild_adventures (guild_id, destination, depart, return) VALUES ($1, $2, $3, $4)", guild.ID, pkt.Destination, TimeAdjusted().Unix(), TimeAdjusted().Add(6*time.Hour).Unix()) + _, err := s.server.db.Exec("INSERT INTO guild_adventures (guild_id, destination, depart, return) VALUES ($1, $2, $3, $4)", guild.ID, pkt.Destination, gametime.TimeAdjusted().Unix(), gametime.TimeAdjusted().Add(6*time.Hour).Unix()) if err != nil { s.logger.Error("Failed to register guild adventure", zap.Error(err)) } @@ -87,7 +89,7 @@ func handleMsgMhfChargeGuildAdventure(s *Session, p mhfpacket.MHFPacket) { func handleMsgMhfRegistGuildAdventureDiva(s *Session, p mhfpacket.MHFPacket) { pkt := p.(*mhfpacket.MsgMhfRegistGuildAdventureDiva) guild, _ := GetGuildInfoByCharacterId(s, s.charID) - _, err := s.server.db.Exec("INSERT INTO guild_adventures (guild_id, destination, charge, depart, return) VALUES ($1, $2, $3, $4, $5)", guild.ID, pkt.Destination, pkt.Charge, TimeAdjusted().Unix(), TimeAdjusted().Add(1*time.Hour).Unix()) + _, err := s.server.db.Exec("INSERT INTO guild_adventures (guild_id, destination, charge, depart, return) VALUES ($1, $2, $3, $4, $5)", guild.ID, pkt.Destination, pkt.Charge, gametime.TimeAdjusted().Unix(), gametime.TimeAdjusted().Add(1*time.Hour).Unix()) if err != nil { s.logger.Error("Failed to register guild adventure", zap.Error(err)) } diff --git a/server/channelserver/handlers_guild_alliance.go b/server/channelserver/handlers_guild_alliance.go index 39dbe13f6..94ba123a7 100644 --- a/server/channelserver/handlers_guild_alliance.go +++ b/server/channelserver/handlers_guild_alliance.go @@ -1,12 +1,13 @@ package channelserver import ( - "erupe-ce/common/byteframe" - ps "erupe-ce/common/pascalstring" + "erupe-ce/utils/byteframe" + ps "erupe-ce/utils/pascalstring" "fmt" "time" "erupe-ce/network/mhfpacket" + "github.com/jmoiron/sqlx" "go.uber.org/zap" ) diff --git a/server/channelserver/handlers_guild_scout.go b/server/channelserver/handlers_guild_scout.go index a599ec301..5406e984c 100644 --- a/server/channelserver/handlers_guild_scout.go +++ b/server/channelserver/handlers_guild_scout.go @@ -1,12 +1,14 @@ package channelserver import ( - "erupe-ce/common/byteframe" - "erupe-ce/common/stringsupport" "erupe-ce/network/mhfpacket" + "erupe-ce/utils/byteframe" + "erupe-ce/utils/gametime" + "erupe-ce/utils/stringsupport" "fmt" - "go.uber.org/zap" "io" + + "go.uber.org/zap" ) func handleMsgMhfPostGuildScout(s *Session, p mhfpacket.MHFPacket) { @@ -245,7 +247,7 @@ func handleMsgMhfGetGuildScoutList(s *Session, p mhfpacket.MHFPacket) { bf.WriteUint32(charID) bf.WriteUint32(actorID) bf.WriteUint32(charID) - bf.WriteUint32(uint32(TimeAdjusted().Unix())) + bf.WriteUint32(uint32(gametime.TimeAdjusted().Unix())) bf.WriteUint16(HR) // HR? bf.WriteUint16(GR) // GR? bf.WriteBytes(stringsupport.PaddedString(charName, 32, true)) diff --git a/server/channelserver/handlers_guild_tresure.go b/server/channelserver/handlers_guild_tresure.go index f3f4815e6..9c2a0875a 100644 --- a/server/channelserver/handlers_guild_tresure.go +++ b/server/channelserver/handlers_guild_tresure.go @@ -1,9 +1,10 @@ package channelserver import ( - "erupe-ce/common/byteframe" - "erupe-ce/common/stringsupport" "erupe-ce/network/mhfpacket" + "erupe-ce/utils/byteframe" + "erupe-ce/utils/gametime" + "erupe-ce/utils/stringsupport" "time" ) @@ -54,7 +55,7 @@ func handleMsgMhfEnumerateGuildTresure(s *Session, p mhfpacket.MHFPacket) { } else { for rows.Next() { err = rows.StructScan(&hunt) - if err == nil && hunt.Start.Add(time.Second*time.Duration(s.server.erupeConfig.GameplayOptions.TreasureHuntExpiry)).After(TimeAdjusted()) { + if err == nil && hunt.Start.Add(time.Second*time.Duration(s.server.erupeConfig.GameplayOptions.TreasureHuntExpiry)).After(gametime.TimeAdjusted()) { hunts = append(hunts, hunt) } } diff --git a/server/channelserver/handlers_house.go b/server/channelserver/handlers_house.go index c91660b54..45bac4437 100644 --- a/server/channelserver/handlers_house.go +++ b/server/channelserver/handlers_house.go @@ -1,17 +1,18 @@ package channelserver import ( - "erupe-ce/common/byteframe" - "erupe-ce/common/mhfitem" - ps "erupe-ce/common/pascalstring" - "erupe-ce/common/stringsupport" - "erupe-ce/common/token" _config "erupe-ce/config" "erupe-ce/network/mhfpacket" + "erupe-ce/utils/byteframe" + "erupe-ce/utils/mhfitem" + ps "erupe-ce/utils/pascalstring" + "erupe-ce/utils/stringsupport" + "erupe-ce/utils/token" "fmt" - "go.uber.org/zap" "io" "time" + + "go.uber.org/zap" ) const warehouseNamesQuery = ` diff --git a/server/channelserver/handlers_kouryou.go b/server/channelserver/handlers_kouryou.go index bff9292a6..7487a017e 100644 --- a/server/channelserver/handlers_kouryou.go +++ b/server/channelserver/handlers_kouryou.go @@ -1,8 +1,9 @@ package channelserver import ( - "erupe-ce/common/byteframe" "erupe-ce/network/mhfpacket" + "erupe-ce/utils/byteframe" + "go.uber.org/zap" ) diff --git a/server/channelserver/handlers_mail.go b/server/channelserver/handlers_mail.go index a596d927b..89ce5d3f4 100644 --- a/server/channelserver/handlers_mail.go +++ b/server/channelserver/handlers_mail.go @@ -2,12 +2,13 @@ package channelserver import ( "database/sql" - "erupe-ce/common/stringsupport" + "erupe-ce/utils/stringsupport" "time" - "erupe-ce/common/byteframe" "erupe-ce/network/binpacket" "erupe-ce/network/mhfpacket" + "erupe-ce/utils/byteframe" + "go.uber.org/zap" ) diff --git a/server/channelserver/handlers_mercenary.go b/server/channelserver/handlers_mercenary.go index 611096045..468c9042e 100644 --- a/server/channelserver/handlers_mercenary.go +++ b/server/channelserver/handlers_mercenary.go @@ -1,15 +1,17 @@ package channelserver import ( - "erupe-ce/common/byteframe" - "erupe-ce/common/stringsupport" _config "erupe-ce/config" "erupe-ce/network/mhfpacket" "erupe-ce/server/channelserver/compression/deltacomp" "erupe-ce/server/channelserver/compression/nullcomp" - "go.uber.org/zap" + "erupe-ce/utils/byteframe" + "erupe-ce/utils/gametime" + "erupe-ce/utils/stringsupport" "io" "time" + + "go.uber.org/zap" ) func handleMsgMhfLoadPartner(s *Session, p mhfpacket.MHFPacket) { @@ -40,9 +42,9 @@ func handleMsgMhfLoadLegendDispatch(s *Session, p mhfpacket.MHFPacket) { Unk uint32 Timestamp uint32 }{ - {0, uint32(TimeMidnight().Add(-12 * time.Hour).Unix())}, - {0, uint32(TimeMidnight().Add(12 * time.Hour).Unix())}, - {0, uint32(TimeMidnight().Add(36 * time.Hour).Unix())}, + {0, uint32(gametime.TimeMidnight().Add(-12 * time.Hour).Unix())}, + {0, uint32(gametime.TimeMidnight().Add(12 * time.Hour).Unix())}, + {0, uint32(gametime.TimeMidnight().Add(36 * time.Hour).Unix())}, } bf.WriteUint8(uint8(len(legendDispatch))) for _, dispatch := range legendDispatch { @@ -167,8 +169,8 @@ func handleMsgMhfReadMercenaryW(s *Session, p mhfpacket.MHFPacket) { bf.WriteUint32(pactID) bf.WriteUint32(cid) bf.WriteBool(true) // Escort enabled - bf.WriteUint32(uint32(TimeAdjusted().Unix())) - bf.WriteUint32(uint32(TimeAdjusted().Add(time.Hour * 24 * 7).Unix())) + bf.WriteUint32(uint32(gametime.TimeAdjusted().Unix())) + bf.WriteUint32(uint32(gametime.TimeAdjusted().Add(time.Hour * 24 * 7).Unix())) bf.WriteBytes(stringsupport.PaddedString(name, 18, true)) } else { bf.WriteUint8(0) @@ -186,8 +188,8 @@ func handleMsgMhfReadMercenaryW(s *Session, p mhfpacket.MHFPacket) { loans++ temp.WriteUint32(pactID) temp.WriteUint32(cid) - temp.WriteUint32(uint32(TimeAdjusted().Unix())) - temp.WriteUint32(uint32(TimeAdjusted().Add(time.Hour * 24 * 7).Unix())) + temp.WriteUint32(uint32(gametime.TimeAdjusted().Unix())) + temp.WriteUint32(uint32(gametime.TimeAdjusted().Add(time.Hour * 24 * 7).Unix())) temp.WriteBytes(stringsupport.PaddedString(name, 18, true)) } } @@ -345,7 +347,7 @@ func getGuildAirouList(s *Session) []Airou { if err != nil { continue } - if startTemp.Add(time.Second * time.Duration(s.server.erupeConfig.GameplayOptions.TreasureHuntPartnyaCooldown)).Before(TimeAdjusted()) { + if startTemp.Add(time.Second * time.Duration(s.server.erupeConfig.GameplayOptions.TreasureHuntPartnyaCooldown)).Before(gametime.TimeAdjusted()) { for i, j := range stringsupport.CSVElems(csvTemp) { bannedCats[uint32(j)] = i } diff --git a/server/channelserver/handlers_object.go b/server/channelserver/handlers_object.go index 41f28e5d3..f4d4c4602 100644 --- a/server/channelserver/handlers_object.go +++ b/server/channelserver/handlers_object.go @@ -3,8 +3,8 @@ package channelserver import ( "fmt" - "erupe-ce/common/byteframe" "erupe-ce/network/mhfpacket" + "erupe-ce/utils/byteframe" ) func handleMsgSysCreateObject(s *Session, p mhfpacket.MHFPacket) { diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index a36c8116a..92b09142f 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -3,11 +3,13 @@ package channelserver import ( "database/sql" "encoding/binary" - "erupe-ce/common/byteframe" - "erupe-ce/common/decryption" - ps "erupe-ce/common/pascalstring" + "erupe-ce/utils/byteframe" + "erupe-ce/utils/decryption" + "erupe-ce/utils/gametime" + _config "erupe-ce/config" "erupe-ce/network/mhfpacket" + ps "erupe-ce/utils/pascalstring" "fmt" "io" "os" @@ -153,7 +155,7 @@ func seasonConversion(s *Session, questFile string) string { // Since event quests when seasonal pick day or night and the client requests either one, we need to differentiate between the two to prevent issues. var _time string - if TimeGameAbsolute() > 2880 { + if gametime.TimeGameAbsolute() > 2880 { _time = "d" } else { _time = "n" @@ -354,7 +356,7 @@ func handleMsgMhfEnumerateQuest(s *Session, p mhfpacket.MHFPacket) { rotationTime := startTime.Add(time.Duration(activeDays+inactiveDays) * 24 * time.Hour * time.Duration(extraCycles)) if currentTime.After(rotationTime) { // Normalize rotationTime to 12PM JST to align with the in-game events update notification. - newRotationTime := time.Date(rotationTime.Year(), rotationTime.Month(), rotationTime.Day(), 12, 0, 0, 0, TimeAdjusted().Location()) + newRotationTime := time.Date(rotationTime.Year(), rotationTime.Month(), rotationTime.Day(), 12, 0, 0, 0, gametime.TimeAdjusted().Location()) _, err = tx.Exec("UPDATE event_quests SET start_time = $1 WHERE id = $2", newRotationTime, id) if err != nil { diff --git a/server/channelserver/handlers_register.go b/server/channelserver/handlers_register.go index 3d47c3633..d9f08e2a2 100644 --- a/server/channelserver/handlers_register.go +++ b/server/channelserver/handlers_register.go @@ -1,8 +1,8 @@ package channelserver import ( - "erupe-ce/common/byteframe" "erupe-ce/network/mhfpacket" + "erupe-ce/utils/byteframe" "strings" ) diff --git a/server/channelserver/handlers_rengoku.go b/server/channelserver/handlers_rengoku.go index 63a591fd2..e784dca77 100644 --- a/server/channelserver/handlers_rengoku.go +++ b/server/channelserver/handlers_rengoku.go @@ -1,14 +1,16 @@ package channelserver import ( - ps "erupe-ce/common/pascalstring" + ps "erupe-ce/utils/pascalstring" "fmt" - "github.com/jmoiron/sqlx" "os" "path/filepath" - "erupe-ce/common/byteframe" + "github.com/jmoiron/sqlx" + "erupe-ce/network/mhfpacket" + "erupe-ce/utils/byteframe" + "go.uber.org/zap" ) diff --git a/server/channelserver/handlers_reward.go b/server/channelserver/handlers_reward.go index 73234c2ae..7178edcaa 100644 --- a/server/channelserver/handlers_reward.go +++ b/server/channelserver/handlers_reward.go @@ -3,8 +3,8 @@ package channelserver import ( "encoding/hex" - "erupe-ce/common/byteframe" "erupe-ce/network/mhfpacket" + "erupe-ce/utils/byteframe" ) func handleMsgMhfGetAdditionalBeatReward(s *Session, p mhfpacket.MHFPacket) { diff --git a/server/channelserver/handlers_seibattle.go b/server/channelserver/handlers_seibattle.go index caf5c19c9..711311ae5 100644 --- a/server/channelserver/handlers_seibattle.go +++ b/server/channelserver/handlers_seibattle.go @@ -1,8 +1,8 @@ package channelserver import ( - "erupe-ce/common/byteframe" "erupe-ce/network/mhfpacket" + "erupe-ce/utils/byteframe" ) func handleMsgMhfGetBreakSeibatuLevelReward(s *Session, p mhfpacket.MHFPacket) { diff --git a/server/channelserver/handlers_semaphore.go b/server/channelserver/handlers_semaphore.go index 2088cabea..054ca4ee1 100644 --- a/server/channelserver/handlers_semaphore.go +++ b/server/channelserver/handlers_semaphore.go @@ -1,11 +1,12 @@ package channelserver import ( - "erupe-ce/common/byteframe" - "go.uber.org/zap" + "erupe-ce/utils/byteframe" "strconv" "strings" + "go.uber.org/zap" + "erupe-ce/network/mhfpacket" ) diff --git a/server/channelserver/handlers_shop_gacha.go b/server/channelserver/handlers_shop_gacha.go index 3058fb632..bc6272695 100644 --- a/server/channelserver/handlers_shop_gacha.go +++ b/server/channelserver/handlers_shop_gacha.go @@ -1,10 +1,11 @@ package channelserver import ( - "erupe-ce/common/byteframe" - ps "erupe-ce/common/pascalstring" _config "erupe-ce/config" "erupe-ce/network/mhfpacket" + "erupe-ce/utils/byteframe" + "erupe-ce/utils/gametime" + ps "erupe-ce/utils/pascalstring" "math/rand" ) @@ -574,7 +575,7 @@ func handleMsgMhfGetStepupStatus(s *Session, p mhfpacket.MHFPacket) { } bf := byteframe.NewByteFrame() bf.WriteUint8(step) - bf.WriteUint32(uint32(TimeAdjusted().Unix())) + bf.WriteUint32(uint32(gametime.TimeAdjusted().Unix())) doAckBufSucceed(s, pkt.AckHandle, bf.Data()) } diff --git a/server/channelserver/handlers_stage.go b/server/channelserver/handlers_stage.go index 8a1abbc35..760b2ada8 100644 --- a/server/channelserver/handlers_stage.go +++ b/server/channelserver/handlers_stage.go @@ -5,9 +5,10 @@ import ( "strings" "time" - "erupe-ce/common/byteframe" - ps "erupe-ce/common/pascalstring" "erupe-ce/network/mhfpacket" + "erupe-ce/utils/byteframe" + ps "erupe-ce/utils/pascalstring" + "go.uber.org/zap" ) diff --git a/server/channelserver/handlers_tactics.go b/server/channelserver/handlers_tactics.go index 5ef45913c..62c001156 100644 --- a/server/channelserver/handlers_tactics.go +++ b/server/channelserver/handlers_tactics.go @@ -2,8 +2,8 @@ package channelserver import ( "encoding/hex" - "erupe-ce/common/byteframe" "erupe-ce/network/mhfpacket" + "erupe-ce/utils/byteframe" ) func handleMsgMhfGetUdTacticsPoint(s *Session, p mhfpacket.MHFPacket) { diff --git a/server/channelserver/handlers_tournament.go b/server/channelserver/handlers_tournament.go index 87fc95330..c209e4f53 100644 --- a/server/channelserver/handlers_tournament.go +++ b/server/channelserver/handlers_tournament.go @@ -1,9 +1,10 @@ package channelserver import ( - "erupe-ce/common/byteframe" - ps "erupe-ce/common/pascalstring" "erupe-ce/network/mhfpacket" + "erupe-ce/utils/byteframe" + "erupe-ce/utils/gametime" + ps "erupe-ce/utils/pascalstring" "time" ) @@ -76,7 +77,7 @@ func handleMsgMhfInfoTournament(s *Session, p mhfpacket.MHFPacket) { ps.Uint16(bf, tinfo.Unk6, true) } case 1: - bf.WriteUint32(uint32(TimeAdjusted().Unix())) + bf.WriteUint32(uint32(gametime.TimeAdjusted().Unix())) bf.WriteUint32(0) // Registered ID bf.WriteUint32(0) bf.WriteUint32(0) diff --git a/server/channelserver/handlers_tower.go b/server/channelserver/handlers_tower.go index 8f32a7882..7597c70fc 100644 --- a/server/channelserver/handlers_tower.go +++ b/server/channelserver/handlers_tower.go @@ -3,13 +3,14 @@ package channelserver import ( _config "erupe-ce/config" "fmt" - "go.uber.org/zap" "strings" "time" - "erupe-ce/common/byteframe" - "erupe-ce/common/stringsupport" + "go.uber.org/zap" + "erupe-ce/network/mhfpacket" + "erupe-ce/utils/byteframe" + "erupe-ce/utils/stringsupport" ) type TowerInfoTRP struct { diff --git a/server/channelserver/sys_channel_server.go b/server/channelserver/sys_channel_server.go index a1b2c093b..a19b09628 100644 --- a/server/channelserver/sys_channel_server.go +++ b/server/channelserver/sys_channel_server.go @@ -7,12 +7,13 @@ import ( "sync" "time" - "erupe-ce/common/byteframe" - ps "erupe-ce/common/pascalstring" _config "erupe-ce/config" "erupe-ce/network/binpacket" "erupe-ce/network/mhfpacket" "erupe-ce/server/discordbot" + "erupe-ce/utils/byteframe" + "erupe-ce/utils/gametime" + ps "erupe-ce/utils/pascalstring" "github.com/jmoiron/sqlx" "go.uber.org/zap" @@ -435,5 +436,5 @@ func (s *Server) HasSemaphore(ses *Session) bool { func (s *Server) Season() uint8 { sid := int64(((s.ID & 0xFF00) - 4096) / 256) - return uint8(((TimeAdjusted().Unix() / 86400) + sid) % 3) + return uint8(((gametime.TimeAdjusted().Unix() / 86400) + sid) % 3) } diff --git a/server/channelserver/sys_semaphore.go b/server/channelserver/sys_semaphore.go index 2200877ca..b40330371 100644 --- a/server/channelserver/sys_semaphore.go +++ b/server/channelserver/sys_semaphore.go @@ -1,8 +1,8 @@ package channelserver import ( - "erupe-ce/common/byteframe" "erupe-ce/network/mhfpacket" + "erupe-ce/utils/byteframe" "sync" ) diff --git a/server/channelserver/sys_session.go b/server/channelserver/sys_session.go index 86552f611..0f04d8900 100644 --- a/server/channelserver/sys_session.go +++ b/server/channelserver/sys_session.go @@ -3,19 +3,20 @@ package channelserver import ( "encoding/binary" "encoding/hex" - "erupe-ce/common/mhfcourse" _config "erupe-ce/config" + "erupe-ce/utils/gametime" + "erupe-ce/utils/mhfcourse" "fmt" "io" "net" "sync" "time" - "erupe-ce/common/byteframe" - "erupe-ce/common/stringstack" "erupe-ce/network" "erupe-ce/network/clientctx" "erupe-ce/network/mhfpacket" + "erupe-ce/utils/byteframe" + "erupe-ce/utils/stringstack" "go.uber.org/zap" ) @@ -80,7 +81,7 @@ func NewSession(server *Server, conn net.Conn) *Session { sendPackets: make(chan packet, 20), clientContext: &clientctx.ClientContext{}, // Unused lastPacket: time.Now(), - sessionStart: TimeAdjusted().Unix(), + sessionStart: gametime.TimeAdjusted().Unix(), stageMoveStack: stringstack.New(), ackStart: make(map[uint32]time.Time), semaphoreID: make([]uint16, 2), diff --git a/server/channelserver/sys_stage.go b/server/channelserver/sys_stage.go index b0f94a09a..a6b7ba375 100644 --- a/server/channelserver/sys_stage.go +++ b/server/channelserver/sys_stage.go @@ -3,8 +3,8 @@ package channelserver import ( "sync" - "erupe-ce/common/byteframe" "erupe-ce/network/mhfpacket" + "erupe-ce/utils/byteframe" ) // Object holds infomation about a specific object. diff --git a/server/entranceserver/make_resp.go b/server/entranceserver/make_resp.go index 57b04d0e1..003adbb4f 100644 --- a/server/entranceserver/make_resp.go +++ b/server/entranceserver/make_resp.go @@ -3,13 +3,13 @@ package entranceserver import ( "encoding/binary" "encoding/hex" - "erupe-ce/common/stringsupport" _config "erupe-ce/config" + "erupe-ce/utils/gametime" + "erupe-ce/utils/stringsupport" "fmt" "net" - "erupe-ce/common/byteframe" - "erupe-ce/server/channelserver" + "erupe-ce/utils/byteframe" ) func encodeServerInfo(config *_config.Config, s *Server, local bool) []byte { @@ -41,7 +41,7 @@ func encodeServerInfo(config *_config.Config, s *Server, local bool) []byte { bf.WriteUint16(0) bf.WriteUint16(uint16(len(si.Channels))) bf.WriteUint8(si.Type) - bf.WriteUint8(uint8(((channelserver.TimeAdjusted().Unix() / 86400) + int64(serverIdx)) % 3)) + bf.WriteUint8(uint8(((gametime.TimeAdjusted().Unix() / 86400) + int64(serverIdx)) % 3)) if s.erupeConfig.RealClientMode >= _config.G1 { bf.WriteUint8(si.Recommended) } @@ -85,7 +85,7 @@ func encodeServerInfo(config *_config.Config, s *Server, local bool) []byte { bf.WriteUint16(12345) } } - bf.WriteUint32(uint32(channelserver.TimeAdjusted().Unix())) + bf.WriteUint32(uint32(gametime.TimeAdjusted().Unix())) bf.WriteUint32(uint32(s.erupeConfig.GameplayOptions.ClanMemberLimits[len(s.erupeConfig.GameplayOptions.ClanMemberLimits)-1][1])) return bf.Data() } diff --git a/server/signserver/dbutils.go b/server/signserver/dbutils.go index 1469af362..bacce3de9 100644 --- a/server/signserver/dbutils.go +++ b/server/signserver/dbutils.go @@ -3,8 +3,8 @@ package signserver import ( "database/sql" "errors" - "erupe-ce/common/mhfcourse" - "erupe-ce/common/token" + "erupe-ce/utils/mhfcourse" + "erupe-ce/utils/token" "strings" "time" diff --git a/server/signserver/dsgn_resp.go b/server/signserver/dsgn_resp.go index 3d102d52c..a4c3f8846 100644 --- a/server/signserver/dsgn_resp.go +++ b/server/signserver/dsgn_resp.go @@ -1,11 +1,12 @@ package signserver import ( - "erupe-ce/common/byteframe" - ps "erupe-ce/common/pascalstring" - "erupe-ce/common/stringsupport" + "erupe-ce/utils/byteframe" + "erupe-ce/utils/gametime" + ps "erupe-ce/utils/pascalstring" + "erupe-ce/utils/stringsupport" + _config "erupe-ce/config" - "erupe-ce/server/channelserver" "fmt" "strings" "time" @@ -50,7 +51,7 @@ func (s *Session) makeSignResponse(uid uint32) []byte { bf.WriteUint8(uint8(len(chars))) bf.WriteUint32(tokenID) bf.WriteBytes([]byte(sessToken)) - bf.WriteUint32(uint32(channelserver.TimeAdjusted().Unix())) + bf.WriteUint32(uint32(gametime.TimeAdjusted().Unix())) if s.client == PS3 { ps.Uint8(bf, fmt.Sprintf("%s/ps3", s.server.erupeConfig.PatchServerManifest), false) ps.Uint8(bf, fmt.Sprintf("%s/ps3", s.server.erupeConfig.PatchServerFile), false) @@ -378,11 +379,11 @@ func (s *Session) makeSignResponse(uid uint32) []byte { } // We can just use the start timestamp as the event ID - bf.WriteUint32(uint32(channelserver.TimeWeekStart().Unix())) + bf.WriteUint32(uint32(gametime.TimeWeekStart().Unix())) // Start time - bf.WriteUint32(uint32(channelserver.TimeWeekNext().Add(-time.Duration(s.server.erupeConfig.GameplayOptions.MezFesDuration) * time.Second).Unix())) + bf.WriteUint32(uint32(gametime.TimeWeekNext().Add(-time.Duration(s.server.erupeConfig.GameplayOptions.MezFesDuration) * time.Second).Unix())) // End time - bf.WriteUint32(uint32(channelserver.TimeWeekNext().Unix())) + bf.WriteUint32(uint32(gametime.TimeWeekNext().Unix())) bf.WriteUint8(uint8(len(tickets))) for i := range tickets { bf.WriteUint32(tickets[i]) diff --git a/server/signserver/session.go b/server/signserver/session.go index c314a44a0..68fc1e95b 100644 --- a/server/signserver/session.go +++ b/server/signserver/session.go @@ -3,14 +3,14 @@ package signserver import ( "database/sql" "encoding/hex" - "erupe-ce/common/stringsupport" + "erupe-ce/utils/stringsupport" "fmt" "net" "strings" "sync" - "erupe-ce/common/byteframe" "erupe-ce/network" + "erupe-ce/utils/byteframe" "go.uber.org/zap" ) diff --git a/common/bfutil/bfutil.go b/utils/bfutil/bfutil.go similarity index 100% rename from common/bfutil/bfutil.go rename to utils/bfutil/bfutil.go diff --git a/common/byteframe/LICENSE b/utils/byteframe/LICENSE similarity index 100% rename from common/byteframe/LICENSE rename to utils/byteframe/LICENSE diff --git a/common/byteframe/byteframe.go b/utils/byteframe/byteframe.go similarity index 100% rename from common/byteframe/byteframe.go rename to utils/byteframe/byteframe.go diff --git a/common/decryption/jpk.go b/utils/decryption/jpk.go similarity index 98% rename from common/decryption/jpk.go rename to utils/decryption/jpk.go index 99011b625..6c99473c7 100644 --- a/common/decryption/jpk.go +++ b/utils/decryption/jpk.go @@ -6,7 +6,7 @@ package decryption */ import ( - "erupe-ce/common/byteframe" + "erupe-ce/utils/byteframe" "io" ) diff --git a/server/channelserver/sys_time.go b/utils/gametime/gametime.go similarity index 97% rename from server/channelserver/sys_time.go rename to utils/gametime/gametime.go index bae61a1c6..4f61371bb 100644 --- a/server/channelserver/sys_time.go +++ b/utils/gametime/gametime.go @@ -1,4 +1,4 @@ -package channelserver +package gametime import ( "time" diff --git a/common/mhfcid/mhfcid.go b/utils/mhfcid/mhfcid.go similarity index 100% rename from common/mhfcid/mhfcid.go rename to utils/mhfcid/mhfcid.go diff --git a/common/mhfcourse/mhfcourse.go b/utils/mhfcourse/mhfcourse.go similarity index 100% rename from common/mhfcourse/mhfcourse.go rename to utils/mhfcourse/mhfcourse.go diff --git a/common/mhfitem/mhfitem.go b/utils/mhfitem/mhfitem.go similarity index 98% rename from common/mhfitem/mhfitem.go rename to utils/mhfitem/mhfitem.go index 58fbf45e7..07b6b06d1 100644 --- a/common/mhfitem/mhfitem.go +++ b/utils/mhfitem/mhfitem.go @@ -1,9 +1,9 @@ package mhfitem import ( - "erupe-ce/common/byteframe" - "erupe-ce/common/token" _config "erupe-ce/config" + "erupe-ce/utils/byteframe" + "erupe-ce/utils/token" ) type MHFItem struct { diff --git a/common/mhfmon/mhfmon.go b/utils/mhfmon/mhfmon.go similarity index 100% rename from common/mhfmon/mhfmon.go rename to utils/mhfmon/mhfmon.go diff --git a/common/pascalstring/pascalstring.go b/utils/pascalstring/pascalstring.go similarity index 97% rename from common/pascalstring/pascalstring.go rename to utils/pascalstring/pascalstring.go index 8ad332018..eab16a713 100644 --- a/common/pascalstring/pascalstring.go +++ b/utils/pascalstring/pascalstring.go @@ -1,7 +1,8 @@ package pascalstring import ( - "erupe-ce/common/byteframe" + "erupe-ce/utils/byteframe" + "golang.org/x/text/encoding/japanese" "golang.org/x/text/transform" ) diff --git a/common/stringstack/stringstack.go b/utils/stringstack/stringstack.go similarity index 100% rename from common/stringstack/stringstack.go rename to utils/stringstack/stringstack.go diff --git a/common/stringsupport/string_convert.go b/utils/stringsupport/string_convert.go similarity index 100% rename from common/stringsupport/string_convert.go rename to utils/stringsupport/string_convert.go diff --git a/common/token/token.go b/utils/token/token.go similarity index 100% rename from common/token/token.go rename to utils/token/token.go