diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 2b2e8a4fd..cb7c147c4 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -1,4 +1,4 @@ -name: Erupe +name: Build on: [push] @@ -15,16 +15,16 @@ jobs: go-version: 1.18 - name: Build - run: cd Erupe && go build -v + run: go build -v - name: Upload artifacts uses: actions/upload-artifact@v3 with: name: Erupe path: | - ./Erupe/erupe-ce.exe - ./Erupe/config.json - ./Erupe/www/ - ./Erupe/savedata/ - ./Erupe/bin/ - ./Erupe/RoadShopItems.csv + ./erupe-ce.exe + ./config.json + ./www/ + ./savedata/ + ./bin/ + ./RoadShopItems.csv diff --git a/Erupe/.gitignore b/Erupe/.gitignore deleted file mode 100644 index 38fdf2e18..000000000 --- a/Erupe/.gitignore +++ /dev/null @@ -1,14 +0,0 @@ -.idea/ - -www/jp/ -vendor/ -bin/*.bin -bin/*.bak -bin/quests/*.bin -bin/questlists/*.bin -bin/scenarios/*.bin -bin/debug/*.bin -savedata/*/ -*.exe -*.lnk -*.bat \ No newline at end of file diff --git a/Erupe/common/pascalstring/pascalstring.go b/Erupe/common/pascalstring/pascalstring.go deleted file mode 100644 index 8c815b097..000000000 --- a/Erupe/common/pascalstring/pascalstring.go +++ /dev/null @@ -1,46 +0,0 @@ -package pascalstring - -import ( - "erupe-ce/common/byteframe" - "golang.org/x/text/encoding/japanese" - "golang.org/x/text/transform" -) - -func Uint8(bf *byteframe.ByteFrame, x string, t bool) { - if t { - e := japanese.ShiftJIS.NewEncoder() - xt, _, err := transform.String(e, x) - if err != nil { - panic(err) - } - x = xt - } - bf.WriteUint8(uint8(len(x) + 1)) - bf.WriteNullTerminatedBytes([]byte(x)) -} - -func Uint16(bf *byteframe.ByteFrame, x string, t bool) { - if t { - e := japanese.ShiftJIS.NewEncoder() - xt, _, err := transform.String(e, x) - if err != nil { - panic(err) - } - x = xt - } - bf.WriteUint16(uint16(len(x) + 1)) - bf.WriteNullTerminatedBytes([]byte(x)) -} - -func Uint32(bf *byteframe.ByteFrame, x string, t bool) { - if t { - e := japanese.ShiftJIS.NewEncoder() - xt, _, err := transform.String(e, x) - if err != nil { - panic(err) - } - x = xt - } - bf.WriteUint32(uint32(len(x) + 1)) - bf.WriteNullTerminatedBytes([]byte(x)) -} diff --git a/Erupe/RoadShopItems.csv b/RoadShopItems.csv similarity index 100% rename from Erupe/RoadShopItems.csv rename to RoadShopItems.csv diff --git a/Erupe/bin/.gitkeep b/bin/.gitkeep similarity index 100% rename from Erupe/bin/.gitkeep rename to bin/.gitkeep diff --git a/Erupe/bin/questlists/psql.txt b/bin/questlists/psql.txt similarity index 100% rename from Erupe/bin/questlists/psql.txt rename to bin/questlists/psql.txt diff --git a/Erupe/common/bfutil/bfutil.go b/common/bfutil/bfutil.go similarity index 100% rename from Erupe/common/bfutil/bfutil.go rename to common/bfutil/bfutil.go diff --git a/Erupe/common/byteframe/LICENSE b/common/byteframe/LICENSE similarity index 100% rename from Erupe/common/byteframe/LICENSE rename to common/byteframe/LICENSE diff --git a/Erupe/common/byteframe/byteframe.go b/common/byteframe/byteframe.go similarity index 100% rename from Erupe/common/byteframe/byteframe.go rename to common/byteframe/byteframe.go diff --git a/common/pascalstring/pascalstring.go b/common/pascalstring/pascalstring.go new file mode 100644 index 000000000..3640db22d --- /dev/null +++ b/common/pascalstring/pascalstring.go @@ -0,0 +1,46 @@ +package pascalstring + +import ( + "erupe-ce/common/byteframe" + "golang.org/x/text/encoding/japanese" + "golang.org/x/text/transform" +) + +func Uint8(bf *byteframe.ByteFrame, x string, t bool) { + if t { + e := japanese.ShiftJIS.NewEncoder() + xt, _, err := transform.String(e, x) + if err != nil { + panic(err) + } + x = xt + } + bf.WriteUint8(uint8(len(x) + 1)) + bf.WriteNullTerminatedBytes([]byte(x)) +} + +func Uint16(bf *byteframe.ByteFrame, x string, t bool) { + if t { + e := japanese.ShiftJIS.NewEncoder() + xt, _, err := transform.String(e, x) + if err != nil { + panic(err) + } + x = xt + } + bf.WriteUint16(uint16(len(x) + 1)) + bf.WriteNullTerminatedBytes([]byte(x)) +} + +func Uint32(bf *byteframe.ByteFrame, x string, t bool) { + if t { + e := japanese.ShiftJIS.NewEncoder() + xt, _, err := transform.String(e, x) + if err != nil { + panic(err) + } + x = xt + } + bf.WriteUint32(uint32(len(x) + 1)) + bf.WriteNullTerminatedBytes([]byte(x)) +} diff --git a/Erupe/common/stringstack/stringstack.go b/common/stringstack/stringstack.go similarity index 100% rename from Erupe/common/stringstack/stringstack.go rename to common/stringstack/stringstack.go diff --git a/Erupe/common/stringsupport/string_convert.go b/common/stringsupport/string_convert.go similarity index 100% rename from Erupe/common/stringsupport/string_convert.go rename to common/stringsupport/string_convert.go diff --git a/Erupe/config.json b/config.json similarity index 100% rename from Erupe/config.json rename to config.json diff --git a/Erupe/config/config.go b/config/config.go similarity index 100% rename from Erupe/config/config.go rename to config/config.go diff --git a/Erupe/go.mod b/go.mod similarity index 100% rename from Erupe/go.mod rename to go.mod diff --git a/Erupe/go.sum b/go.sum similarity index 100% rename from Erupe/go.sum rename to go.sum diff --git a/Erupe/main.go b/main.go similarity index 100% rename from Erupe/main.go rename to main.go diff --git a/Erupe/migrations/000001_initial_db.down.sql b/migrations/000001_initial_db.down.sql similarity index 100% rename from Erupe/migrations/000001_initial_db.down.sql rename to migrations/000001_initial_db.down.sql diff --git a/Erupe/migrations/000001_initial_db.up.sql b/migrations/000001_initial_db.up.sql similarity index 100% rename from Erupe/migrations/000001_initial_db.up.sql rename to migrations/000001_initial_db.up.sql diff --git a/Erupe/migrations/000002_alter_characters.down.sql b/migrations/000002_alter_characters.down.sql similarity index 100% rename from Erupe/migrations/000002_alter_characters.down.sql rename to migrations/000002_alter_characters.down.sql diff --git a/Erupe/migrations/000002_alter_characters.up.sql b/migrations/000002_alter_characters.up.sql similarity index 100% rename from Erupe/migrations/000002_alter_characters.up.sql rename to migrations/000002_alter_characters.up.sql diff --git a/Erupe/migrations/000003_character_savedata.down.sql b/migrations/000003_character_savedata.down.sql similarity index 100% rename from Erupe/migrations/000003_character_savedata.down.sql rename to migrations/000003_character_savedata.down.sql diff --git a/Erupe/migrations/000003_character_savedata.up.sql b/migrations/000003_character_savedata.up.sql similarity index 100% rename from Erupe/migrations/000003_character_savedata.up.sql rename to migrations/000003_character_savedata.up.sql diff --git a/Erupe/migrations/000004_character_additional.down.sql b/migrations/000004_character_additional.down.sql similarity index 100% rename from Erupe/migrations/000004_character_additional.down.sql rename to migrations/000004_character_additional.down.sql diff --git a/Erupe/migrations/000004_character_additional.up.sql b/migrations/000004_character_additional.up.sql similarity index 100% rename from Erupe/migrations/000004_character_additional.up.sql rename to migrations/000004_character_additional.up.sql diff --git a/Erupe/migrations/000005_quests.down.sql b/migrations/000005_quests.down.sql similarity index 100% rename from Erupe/migrations/000005_quests.down.sql rename to migrations/000005_quests.down.sql diff --git a/Erupe/migrations/000005_quests.up.sql b/migrations/000005_quests.up.sql similarity index 100% rename from Erupe/migrations/000005_quests.up.sql rename to migrations/000005_quests.up.sql diff --git a/Erupe/migrations/000006_mercenary.down.sql b/migrations/000006_mercenary.down.sql similarity index 100% rename from Erupe/migrations/000006_mercenary.down.sql rename to migrations/000006_mercenary.down.sql diff --git a/Erupe/migrations/000006_mercenary.up.sql b/migrations/000006_mercenary.up.sql similarity index 100% rename from Erupe/migrations/000006_mercenary.up.sql rename to migrations/000006_mercenary.up.sql diff --git a/Erupe/migrations/000007_guilds.down.sql b/migrations/000007_guilds.down.sql similarity index 100% rename from Erupe/migrations/000007_guilds.down.sql rename to migrations/000007_guilds.down.sql diff --git a/Erupe/migrations/000007_guilds.up.sql b/migrations/000007_guilds.up.sql similarity index 100% rename from Erupe/migrations/000007_guilds.up.sql rename to migrations/000007_guilds.up.sql diff --git a/Erupe/migrations/000008_guild_additional.down.sql b/migrations/000008_guild_additional.down.sql similarity index 100% rename from Erupe/migrations/000008_guild_additional.down.sql rename to migrations/000008_guild_additional.down.sql diff --git a/Erupe/migrations/000008_guild_additional.up.sql b/migrations/000008_guild_additional.up.sql similarity index 100% rename from Erupe/migrations/000008_guild_additional.up.sql rename to migrations/000008_guild_additional.up.sql diff --git a/Erupe/migrations/000009_character_social.down.sql b/migrations/000009_character_social.down.sql similarity index 100% rename from Erupe/migrations/000009_character_social.down.sql rename to migrations/000009_character_social.down.sql diff --git a/Erupe/migrations/000009_character_social.up.sql b/migrations/000009_character_social.up.sql similarity index 100% rename from Erupe/migrations/000009_character_social.up.sql rename to migrations/000009_character_social.up.sql diff --git a/Erupe/migrations/000010_guild_comments_festival_hall.down.sql b/migrations/000010_guild_comments_festival_hall.down.sql similarity index 100% rename from Erupe/migrations/000010_guild_comments_festival_hall.down.sql rename to migrations/000010_guild_comments_festival_hall.down.sql diff --git a/Erupe/migrations/000010_guild_comments_festival_hall.up.sql b/migrations/000010_guild_comments_festival_hall.up.sql similarity index 100% rename from Erupe/migrations/000010_guild_comments_festival_hall.up.sql rename to migrations/000010_guild_comments_festival_hall.up.sql diff --git a/Erupe/migrations/000011_character_points_minidata.down.sql b/migrations/000011_character_points_minidata.down.sql similarity index 100% rename from Erupe/migrations/000011_character_points_minidata.down.sql rename to migrations/000011_character_points_minidata.down.sql diff --git a/Erupe/migrations/000011_character_points_minidata.up.sql b/migrations/000011_character_points_minidata.up.sql similarity index 100% rename from Erupe/migrations/000011_character_points_minidata.up.sql rename to migrations/000011_character_points_minidata.up.sql diff --git a/Erupe/migrations/000012_loginboost_etc.down.sql b/migrations/000012_loginboost_etc.down.sql similarity index 100% rename from Erupe/migrations/000012_loginboost_etc.down.sql rename to migrations/000012_loginboost_etc.down.sql diff --git a/Erupe/migrations/000012_loginboost_etc.up.sql b/migrations/000012_loginboost_etc.up.sql similarity index 100% rename from Erupe/migrations/000012_loginboost_etc.up.sql rename to migrations/000012_loginboost_etc.up.sql diff --git a/Erupe/migrations/000013_shop_constraints.down.sql b/migrations/000013_shop_constraints.down.sql similarity index 100% rename from Erupe/migrations/000013_shop_constraints.down.sql rename to migrations/000013_shop_constraints.down.sql diff --git a/Erupe/migrations/000013_shop_constraints.up.sql b/migrations/000013_shop_constraints.up.sql similarity index 100% rename from Erupe/migrations/000013_shop_constraints.up.sql rename to migrations/000013_shop_constraints.up.sql diff --git a/Erupe/migrations/000014_guild_flags_applications.down.sql b/migrations/000014_guild_flags_applications.down.sql similarity index 100% rename from Erupe/migrations/000014_guild_flags_applications.down.sql rename to migrations/000014_guild_flags_applications.down.sql diff --git a/Erupe/migrations/000014_guild_flags_applications.up.sql b/migrations/000014_guild_flags_applications.up.sql similarity index 100% rename from Erupe/migrations/000014_guild_flags_applications.up.sql rename to migrations/000014_guild_flags_applications.up.sql diff --git a/Erupe/migrations/000015_mail.down.sql b/migrations/000015_mail.down.sql similarity index 100% rename from Erupe/migrations/000015_mail.down.sql rename to migrations/000015_mail.down.sql diff --git a/Erupe/migrations/000015_mail.up.sql b/migrations/000015_mail.up.sql similarity index 100% rename from Erupe/migrations/000015_mail.up.sql rename to migrations/000015_mail.up.sql diff --git a/Erupe/migrations/000016_server.down.sql b/migrations/000016_server.down.sql similarity index 100% rename from Erupe/migrations/000016_server.down.sql rename to migrations/000016_server.down.sql diff --git a/Erupe/migrations/000016_server.up.sql b/migrations/000016_server.up.sql similarity index 100% rename from Erupe/migrations/000016_server.up.sql rename to migrations/000016_server.up.sql diff --git a/Erupe/migrations/000017_account.down.sql b/migrations/000017_account.down.sql similarity index 100% rename from Erupe/migrations/000017_account.down.sql rename to migrations/000017_account.down.sql diff --git a/Erupe/migrations/000017_account.up.sql b/migrations/000017_account.up.sql similarity index 100% rename from Erupe/migrations/000017_account.up.sql rename to migrations/000017_account.up.sql diff --git a/Erupe/migrations/000018_event_week.down.sql b/migrations/000018_event_week.down.sql similarity index 100% rename from Erupe/migrations/000018_event_week.down.sql rename to migrations/000018_event_week.down.sql diff --git a/Erupe/migrations/000018_event_week.up.sql b/migrations/000018_event_week.up.sql similarity index 100% rename from Erupe/migrations/000018_event_week.up.sql rename to migrations/000018_event_week.up.sql diff --git a/Erupe/migrations/000019_gook.down.sql b/migrations/000019_gook.down.sql similarity index 100% rename from Erupe/migrations/000019_gook.down.sql rename to migrations/000019_gook.down.sql diff --git a/Erupe/migrations/000019_gook.up.sql b/migrations/000019_gook.up.sql similarity index 100% rename from Erupe/migrations/000019_gook.up.sql rename to migrations/000019_gook.up.sql diff --git a/Erupe/migrations/000020_history.down.sql b/migrations/000020_history.down.sql similarity index 100% rename from Erupe/migrations/000020_history.down.sql rename to migrations/000020_history.down.sql diff --git a/Erupe/migrations/000020_history.up.sql b/migrations/000020_history.up.sql similarity index 100% rename from Erupe/migrations/000020_history.up.sql rename to migrations/000020_history.up.sql diff --git a/Erupe/network/binpacket/msg_bin_chat.go b/network/binpacket/msg_bin_chat.go similarity index 100% rename from Erupe/network/binpacket/msg_bin_chat.go rename to network/binpacket/msg_bin_chat.go diff --git a/Erupe/network/binpacket/msg_bin_mail_notify.go b/network/binpacket/msg_bin_mail_notify.go similarity index 100% rename from Erupe/network/binpacket/msg_bin_mail_notify.go rename to network/binpacket/msg_bin_mail_notify.go index a829b9a5e..5e1687512 100644 --- a/Erupe/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/common/byteframe" ) type MsgBinMailNotify struct { diff --git a/Erupe/network/binpacket/msg_bin_targeted.go b/network/binpacket/msg_bin_targeted.go similarity index 100% rename from Erupe/network/binpacket/msg_bin_targeted.go rename to network/binpacket/msg_bin_targeted.go index 2a27a0d8e..87bfb54ce 100644 --- a/Erupe/network/binpacket/msg_bin_targeted.go +++ b/network/binpacket/msg_bin_targeted.go @@ -1,8 +1,8 @@ package binpacket import ( - "erupe-ce/network" "erupe-ce/common/byteframe" + "erupe-ce/network" ) // MsgBinTargeted is a format used for some broadcast types diff --git a/Erupe/network/clientctx/clientcontext.go b/network/clientctx/clientcontext.go similarity index 100% rename from Erupe/network/clientctx/clientcontext.go rename to network/clientctx/clientcontext.go diff --git a/Erupe/network/crypt_conn.go b/network/crypt_conn.go similarity index 100% rename from Erupe/network/crypt_conn.go rename to network/crypt_conn.go diff --git a/Erupe/network/crypt_packet.go b/network/crypt_packet.go similarity index 99% rename from Erupe/network/crypt_packet.go rename to network/crypt_packet.go index 03ba4a293..ae556d42e 100644 --- a/Erupe/network/crypt_packet.go +++ b/network/crypt_packet.go @@ -87,4 +87,4 @@ func (c *CryptPacketHeader) Encode() ([]byte, error) { } return buf.Bytes(), nil -} \ No newline at end of file +} diff --git a/Erupe/network/crypto/crypto.go b/network/crypto/crypto.go similarity index 100% rename from Erupe/network/crypto/crypto.go rename to network/crypto/crypto.go diff --git a/Erupe/network/crypto/crypto_test.go b/network/crypto/crypto_test.go similarity index 100% rename from Erupe/network/crypto/crypto_test.go rename to network/crypto/crypto_test.go diff --git a/Erupe/network/mhfpacket/mhfpacket.go b/network/mhfpacket/mhfpacket.go similarity index 100% rename from Erupe/network/mhfpacket/mhfpacket.go rename to network/mhfpacket/mhfpacket.go diff --git a/Erupe/network/mhfpacket/msg_ca_exchange_item.go b/network/mhfpacket/msg_ca_exchange_item.go similarity index 100% rename from Erupe/network/mhfpacket/msg_ca_exchange_item.go rename to network/mhfpacket/msg_ca_exchange_item.go diff --git a/Erupe/network/mhfpacket/msg_head.go b/network/mhfpacket/msg_head.go similarity index 100% rename from Erupe/network/mhfpacket/msg_head.go rename to network/mhfpacket/msg_head.go diff --git a/Erupe/network/mhfpacket/msg_mhf_accept_read_reward.go b/network/mhfpacket/msg_mhf_accept_read_reward.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_accept_read_reward.go rename to network/mhfpacket/msg_mhf_accept_read_reward.go diff --git a/Erupe/network/mhfpacket/msg_mhf_acquire_cafe_item.go b/network/mhfpacket/msg_mhf_acquire_cafe_item.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_acquire_cafe_item.go rename to network/mhfpacket/msg_mhf_acquire_cafe_item.go diff --git a/Erupe/network/mhfpacket/msg_mhf_acquire_dist_item.go b/network/mhfpacket/msg_mhf_acquire_dist_item.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_acquire_dist_item.go rename to network/mhfpacket/msg_mhf_acquire_dist_item.go diff --git a/Erupe/network/mhfpacket/msg_mhf_acquire_exchange_shop.go b/network/mhfpacket/msg_mhf_acquire_exchange_shop.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_acquire_exchange_shop.go rename to network/mhfpacket/msg_mhf_acquire_exchange_shop.go diff --git a/Erupe/network/mhfpacket/msg_mhf_acquire_festa.go b/network/mhfpacket/msg_mhf_acquire_festa.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_acquire_festa.go rename to network/mhfpacket/msg_mhf_acquire_festa.go diff --git a/Erupe/network/mhfpacket/msg_mhf_acquire_festa_intermediate_prize.go b/network/mhfpacket/msg_mhf_acquire_festa_intermediate_prize.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_acquire_festa_intermediate_prize.go rename to network/mhfpacket/msg_mhf_acquire_festa_intermediate_prize.go diff --git a/Erupe/network/mhfpacket/msg_mhf_acquire_festa_personal_prize.go b/network/mhfpacket/msg_mhf_acquire_festa_personal_prize.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_acquire_festa_personal_prize.go rename to network/mhfpacket/msg_mhf_acquire_festa_personal_prize.go diff --git a/Erupe/network/mhfpacket/msg_mhf_acquire_guild_adventure.go b/network/mhfpacket/msg_mhf_acquire_guild_adventure.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_acquire_guild_adventure.go rename to network/mhfpacket/msg_mhf_acquire_guild_adventure.go diff --git a/Erupe/network/mhfpacket/msg_mhf_acquire_guild_tresure.go b/network/mhfpacket/msg_mhf_acquire_guild_tresure.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_acquire_guild_tresure.go rename to network/mhfpacket/msg_mhf_acquire_guild_tresure.go diff --git a/Erupe/network/mhfpacket/msg_mhf_acquire_guild_tresure_souvenir.go b/network/mhfpacket/msg_mhf_acquire_guild_tresure_souvenir.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_acquire_guild_tresure_souvenir.go rename to network/mhfpacket/msg_mhf_acquire_guild_tresure_souvenir.go diff --git a/Erupe/network/mhfpacket/msg_mhf_acquire_item.go b/network/mhfpacket/msg_mhf_acquire_item.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_acquire_item.go rename to network/mhfpacket/msg_mhf_acquire_item.go diff --git a/Erupe/network/mhfpacket/msg_mhf_acquire_monthly_item.go b/network/mhfpacket/msg_mhf_acquire_monthly_item.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_acquire_monthly_item.go rename to network/mhfpacket/msg_mhf_acquire_monthly_item.go diff --git a/Erupe/network/mhfpacket/msg_mhf_acquire_monthly_reward.go b/network/mhfpacket/msg_mhf_acquire_monthly_reward.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_acquire_monthly_reward.go rename to network/mhfpacket/msg_mhf_acquire_monthly_reward.go diff --git a/Erupe/network/mhfpacket/msg_mhf_acquire_title.go b/network/mhfpacket/msg_mhf_acquire_title.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_acquire_title.go rename to network/mhfpacket/msg_mhf_acquire_title.go diff --git a/Erupe/network/mhfpacket/msg_mhf_acquire_tournament.go b/network/mhfpacket/msg_mhf_acquire_tournament.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_acquire_tournament.go rename to network/mhfpacket/msg_mhf_acquire_tournament.go diff --git a/Erupe/network/mhfpacket/msg_mhf_acquire_ud_item.go b/network/mhfpacket/msg_mhf_acquire_ud_item.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_acquire_ud_item.go rename to network/mhfpacket/msg_mhf_acquire_ud_item.go diff --git a/Erupe/network/mhfpacket/msg_mhf_add_achievement.go b/network/mhfpacket/msg_mhf_add_achievement.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_add_achievement.go rename to network/mhfpacket/msg_mhf_add_achievement.go diff --git a/Erupe/network/mhfpacket/msg_mhf_add_guild_mission_count.go b/network/mhfpacket/msg_mhf_add_guild_mission_count.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_add_guild_mission_count.go rename to network/mhfpacket/msg_mhf_add_guild_mission_count.go diff --git a/Erupe/network/mhfpacket/msg_mhf_add_guild_weekly_bonus_exceptional_user.go b/network/mhfpacket/msg_mhf_add_guild_weekly_bonus_exceptional_user.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_add_guild_weekly_bonus_exceptional_user.go rename to network/mhfpacket/msg_mhf_add_guild_weekly_bonus_exceptional_user.go diff --git a/Erupe/network/mhfpacket/msg_mhf_add_kouryou_point.go b/network/mhfpacket/msg_mhf_add_kouryou_point.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_add_kouryou_point.go rename to network/mhfpacket/msg_mhf_add_kouryou_point.go diff --git a/Erupe/network/mhfpacket/msg_mhf_add_reward_song_count.go b/network/mhfpacket/msg_mhf_add_reward_song_count.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_add_reward_song_count.go rename to network/mhfpacket/msg_mhf_add_reward_song_count.go diff --git a/Erupe/network/mhfpacket/msg_mhf_add_ud_point.go b/network/mhfpacket/msg_mhf_add_ud_point.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_add_ud_point.go rename to network/mhfpacket/msg_mhf_add_ud_point.go diff --git a/Erupe/network/mhfpacket/msg_mhf_add_ud_tactics_point.go b/network/mhfpacket/msg_mhf_add_ud_tactics_point.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_add_ud_tactics_point.go rename to network/mhfpacket/msg_mhf_add_ud_tactics_point.go diff --git a/Erupe/network/mhfpacket/msg_mhf_announce.go b/network/mhfpacket/msg_mhf_announce.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_announce.go rename to network/mhfpacket/msg_mhf_announce.go diff --git a/Erupe/network/mhfpacket/msg_mhf_answer_guild_scout.go b/network/mhfpacket/msg_mhf_answer_guild_scout.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_answer_guild_scout.go rename to network/mhfpacket/msg_mhf_answer_guild_scout.go diff --git a/Erupe/network/mhfpacket/msg_mhf_apply_bbs_article.go b/network/mhfpacket/msg_mhf_apply_bbs_article.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_apply_bbs_article.go rename to network/mhfpacket/msg_mhf_apply_bbs_article.go diff --git a/Erupe/network/mhfpacket/msg_mhf_apply_campaign.go b/network/mhfpacket/msg_mhf_apply_campaign.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_apply_campaign.go rename to network/mhfpacket/msg_mhf_apply_campaign.go diff --git a/Erupe/network/mhfpacket/msg_mhf_apply_dist_item.go b/network/mhfpacket/msg_mhf_apply_dist_item.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_apply_dist_item.go rename to network/mhfpacket/msg_mhf_apply_dist_item.go diff --git a/Erupe/network/mhfpacket/msg_mhf_arrange_guild_member.go b/network/mhfpacket/msg_mhf_arrange_guild_member.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_arrange_guild_member.go rename to network/mhfpacket/msg_mhf_arrange_guild_member.go diff --git a/Erupe/network/mhfpacket/msg_mhf_cancel_guild_mission_target.go b/network/mhfpacket/msg_mhf_cancel_guild_mission_target.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_cancel_guild_mission_target.go rename to network/mhfpacket/msg_mhf_cancel_guild_mission_target.go diff --git a/Erupe/network/mhfpacket/msg_mhf_cancel_guild_scout.go b/network/mhfpacket/msg_mhf_cancel_guild_scout.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_cancel_guild_scout.go rename to network/mhfpacket/msg_mhf_cancel_guild_scout.go diff --git a/Erupe/network/mhfpacket/msg_mhf_caravan_my_rank.go b/network/mhfpacket/msg_mhf_caravan_my_rank.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_caravan_my_rank.go rename to network/mhfpacket/msg_mhf_caravan_my_rank.go diff --git a/Erupe/network/mhfpacket/msg_mhf_caravan_my_score.go b/network/mhfpacket/msg_mhf_caravan_my_score.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_caravan_my_score.go rename to network/mhfpacket/msg_mhf_caravan_my_score.go diff --git a/Erupe/network/mhfpacket/msg_mhf_caravan_ranking.go b/network/mhfpacket/msg_mhf_caravan_ranking.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_caravan_ranking.go rename to network/mhfpacket/msg_mhf_caravan_ranking.go diff --git a/Erupe/network/mhfpacket/msg_mhf_charge_festa.go b/network/mhfpacket/msg_mhf_charge_festa.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_charge_festa.go rename to network/mhfpacket/msg_mhf_charge_festa.go diff --git a/Erupe/network/mhfpacket/msg_mhf_charge_guild_adventure.go b/network/mhfpacket/msg_mhf_charge_guild_adventure.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_charge_guild_adventure.go rename to network/mhfpacket/msg_mhf_charge_guild_adventure.go diff --git a/Erupe/network/mhfpacket/msg_mhf_check_daily_cafepoint.go b/network/mhfpacket/msg_mhf_check_daily_cafepoint.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_check_daily_cafepoint.go rename to network/mhfpacket/msg_mhf_check_daily_cafepoint.go diff --git a/Erupe/network/mhfpacket/msg_mhf_check_monthly_item.go b/network/mhfpacket/msg_mhf_check_monthly_item.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_check_monthly_item.go rename to network/mhfpacket/msg_mhf_check_monthly_item.go diff --git a/Erupe/network/mhfpacket/msg_mhf_check_weekly_stamp.go b/network/mhfpacket/msg_mhf_check_weekly_stamp.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_check_weekly_stamp.go rename to network/mhfpacket/msg_mhf_check_weekly_stamp.go diff --git a/Erupe/network/mhfpacket/msg_mhf_contract_mercenary.go b/network/mhfpacket/msg_mhf_contract_mercenary.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_contract_mercenary.go rename to network/mhfpacket/msg_mhf_contract_mercenary.go diff --git a/Erupe/network/mhfpacket/msg_mhf_create_guild.go b/network/mhfpacket/msg_mhf_create_guild.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_create_guild.go rename to network/mhfpacket/msg_mhf_create_guild.go diff --git a/Erupe/network/mhfpacket/msg_mhf_create_joint.go b/network/mhfpacket/msg_mhf_create_joint.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_create_joint.go rename to network/mhfpacket/msg_mhf_create_joint.go diff --git a/Erupe/network/mhfpacket/msg_mhf_create_mercenary.go b/network/mhfpacket/msg_mhf_create_mercenary.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_create_mercenary.go rename to network/mhfpacket/msg_mhf_create_mercenary.go diff --git a/Erupe/network/mhfpacket/msg_mhf_debug_post_value.go b/network/mhfpacket/msg_mhf_debug_post_value.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_debug_post_value.go rename to network/mhfpacket/msg_mhf_debug_post_value.go diff --git a/Erupe/network/mhfpacket/msg_mhf_displayed_achievement.go b/network/mhfpacket/msg_mhf_displayed_achievement.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_displayed_achievement.go rename to network/mhfpacket/msg_mhf_displayed_achievement.go diff --git a/Erupe/network/mhfpacket/msg_mhf_enter_tournament_quest.go b/network/mhfpacket/msg_mhf_enter_tournament_quest.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_enter_tournament_quest.go rename to network/mhfpacket/msg_mhf_enter_tournament_quest.go diff --git a/Erupe/network/mhfpacket/msg_mhf_entry_festa.go b/network/mhfpacket/msg_mhf_entry_festa.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_entry_festa.go rename to network/mhfpacket/msg_mhf_entry_festa.go diff --git a/Erupe/network/mhfpacket/msg_mhf_entry_rookie_guild.go b/network/mhfpacket/msg_mhf_entry_rookie_guild.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_entry_rookie_guild.go rename to network/mhfpacket/msg_mhf_entry_rookie_guild.go diff --git a/Erupe/network/mhfpacket/msg_mhf_entry_tournament.go b/network/mhfpacket/msg_mhf_entry_tournament.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_entry_tournament.go rename to network/mhfpacket/msg_mhf_entry_tournament.go diff --git a/Erupe/network/mhfpacket/msg_mhf_enumerate_airoulist.go b/network/mhfpacket/msg_mhf_enumerate_airoulist.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_enumerate_airoulist.go rename to network/mhfpacket/msg_mhf_enumerate_airoulist.go diff --git a/Erupe/network/mhfpacket/msg_mhf_enumerate_campaign.go b/network/mhfpacket/msg_mhf_enumerate_campaign.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_enumerate_campaign.go rename to network/mhfpacket/msg_mhf_enumerate_campaign.go diff --git a/Erupe/network/mhfpacket/msg_mhf_enumerate_dist_item.go b/network/mhfpacket/msg_mhf_enumerate_dist_item.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_enumerate_dist_item.go rename to network/mhfpacket/msg_mhf_enumerate_dist_item.go diff --git a/Erupe/network/mhfpacket/msg_mhf_enumerate_event.go b/network/mhfpacket/msg_mhf_enumerate_event.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_enumerate_event.go rename to network/mhfpacket/msg_mhf_enumerate_event.go diff --git a/Erupe/network/mhfpacket/msg_mhf_enumerate_festa_intermediate_prize.go b/network/mhfpacket/msg_mhf_enumerate_festa_intermediate_prize.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_enumerate_festa_intermediate_prize.go rename to network/mhfpacket/msg_mhf_enumerate_festa_intermediate_prize.go diff --git a/Erupe/network/mhfpacket/msg_mhf_enumerate_festa_member.go b/network/mhfpacket/msg_mhf_enumerate_festa_member.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_enumerate_festa_member.go rename to network/mhfpacket/msg_mhf_enumerate_festa_member.go diff --git a/Erupe/network/mhfpacket/msg_mhf_enumerate_festa_personal_prize.go b/network/mhfpacket/msg_mhf_enumerate_festa_personal_prize.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_enumerate_festa_personal_prize.go rename to network/mhfpacket/msg_mhf_enumerate_festa_personal_prize.go diff --git a/Erupe/network/mhfpacket/msg_mhf_enumerate_guacot.go b/network/mhfpacket/msg_mhf_enumerate_guacot.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_enumerate_guacot.go rename to network/mhfpacket/msg_mhf_enumerate_guacot.go diff --git a/Erupe/network/mhfpacket/msg_mhf_enumerate_guild.go b/network/mhfpacket/msg_mhf_enumerate_guild.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_enumerate_guild.go rename to network/mhfpacket/msg_mhf_enumerate_guild.go diff --git a/Erupe/network/mhfpacket/msg_mhf_enumerate_guild_item.go b/network/mhfpacket/msg_mhf_enumerate_guild_item.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_enumerate_guild_item.go rename to network/mhfpacket/msg_mhf_enumerate_guild_item.go diff --git a/Erupe/network/mhfpacket/msg_mhf_enumerate_guild_member.go b/network/mhfpacket/msg_mhf_enumerate_guild_member.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_enumerate_guild_member.go rename to network/mhfpacket/msg_mhf_enumerate_guild_member.go diff --git a/Erupe/network/mhfpacket/msg_mhf_enumerate_guild_message_board.go b/network/mhfpacket/msg_mhf_enumerate_guild_message_board.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_enumerate_guild_message_board.go rename to network/mhfpacket/msg_mhf_enumerate_guild_message_board.go diff --git a/Erupe/network/mhfpacket/msg_mhf_enumerate_guild_tresure.go b/network/mhfpacket/msg_mhf_enumerate_guild_tresure.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_enumerate_guild_tresure.go rename to network/mhfpacket/msg_mhf_enumerate_guild_tresure.go diff --git a/Erupe/network/mhfpacket/msg_mhf_enumerate_house.go b/network/mhfpacket/msg_mhf_enumerate_house.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_enumerate_house.go rename to network/mhfpacket/msg_mhf_enumerate_house.go diff --git a/Erupe/network/mhfpacket/msg_mhf_enumerate_inv_guild.go b/network/mhfpacket/msg_mhf_enumerate_inv_guild.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_enumerate_inv_guild.go rename to network/mhfpacket/msg_mhf_enumerate_inv_guild.go diff --git a/Erupe/network/mhfpacket/msg_mhf_enumerate_item.go b/network/mhfpacket/msg_mhf_enumerate_item.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_enumerate_item.go rename to network/mhfpacket/msg_mhf_enumerate_item.go diff --git a/Erupe/network/mhfpacket/msg_mhf_enumerate_mercenary_log.go b/network/mhfpacket/msg_mhf_enumerate_mercenary_log.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_enumerate_mercenary_log.go rename to network/mhfpacket/msg_mhf_enumerate_mercenary_log.go diff --git a/Erupe/network/mhfpacket/msg_mhf_enumerate_order.go b/network/mhfpacket/msg_mhf_enumerate_order.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_enumerate_order.go rename to network/mhfpacket/msg_mhf_enumerate_order.go diff --git a/Erupe/network/mhfpacket/msg_mhf_enumerate_price.go b/network/mhfpacket/msg_mhf_enumerate_price.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_enumerate_price.go rename to network/mhfpacket/msg_mhf_enumerate_price.go diff --git a/Erupe/network/mhfpacket/msg_mhf_enumerate_quest.go b/network/mhfpacket/msg_mhf_enumerate_quest.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_enumerate_quest.go rename to network/mhfpacket/msg_mhf_enumerate_quest.go diff --git a/Erupe/network/mhfpacket/msg_mhf_enumerate_ranking.go b/network/mhfpacket/msg_mhf_enumerate_ranking.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_enumerate_ranking.go rename to network/mhfpacket/msg_mhf_enumerate_ranking.go diff --git a/Erupe/network/mhfpacket/msg_mhf_enumerate_rengoku_ranking.go b/network/mhfpacket/msg_mhf_enumerate_rengoku_ranking.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_enumerate_rengoku_ranking.go rename to network/mhfpacket/msg_mhf_enumerate_rengoku_ranking.go diff --git a/Erupe/network/mhfpacket/msg_mhf_enumerate_shop.go b/network/mhfpacket/msg_mhf_enumerate_shop.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_enumerate_shop.go rename to network/mhfpacket/msg_mhf_enumerate_shop.go diff --git a/Erupe/network/mhfpacket/msg_mhf_enumerate_title.go b/network/mhfpacket/msg_mhf_enumerate_title.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_enumerate_title.go rename to network/mhfpacket/msg_mhf_enumerate_title.go diff --git a/Erupe/network/mhfpacket/msg_mhf_enumerate_union_item.go b/network/mhfpacket/msg_mhf_enumerate_union_item.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_enumerate_union_item.go rename to network/mhfpacket/msg_mhf_enumerate_union_item.go diff --git a/Erupe/network/mhfpacket/msg_mhf_enumerate_warehouse.go b/network/mhfpacket/msg_mhf_enumerate_warehouse.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_enumerate_warehouse.go rename to network/mhfpacket/msg_mhf_enumerate_warehouse.go diff --git a/Erupe/network/mhfpacket/msg_mhf_exchange_fpoint_2_item.go b/network/mhfpacket/msg_mhf_exchange_fpoint_2_item.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_exchange_fpoint_2_item.go rename to network/mhfpacket/msg_mhf_exchange_fpoint_2_item.go diff --git a/Erupe/network/mhfpacket/msg_mhf_exchange_item_2_fpoint.go b/network/mhfpacket/msg_mhf_exchange_item_2_fpoint.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_exchange_item_2_fpoint.go rename to network/mhfpacket/msg_mhf_exchange_item_2_fpoint.go diff --git a/Erupe/network/mhfpacket/msg_mhf_exchange_kouryou_point.go b/network/mhfpacket/msg_mhf_exchange_kouryou_point.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_exchange_kouryou_point.go rename to network/mhfpacket/msg_mhf_exchange_kouryou_point.go diff --git a/Erupe/network/mhfpacket/msg_mhf_exchange_weekly_stamp.go b/network/mhfpacket/msg_mhf_exchange_weekly_stamp.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_exchange_weekly_stamp.go rename to network/mhfpacket/msg_mhf_exchange_weekly_stamp.go diff --git a/Erupe/network/mhfpacket/msg_mhf_generate_ud_guild_map.go b/network/mhfpacket/msg_mhf_generate_ud_guild_map.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_generate_ud_guild_map.go rename to network/mhfpacket/msg_mhf_generate_ud_guild_map.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_achievement.go b/network/mhfpacket/msg_mhf_get_achievement.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_achievement.go rename to network/mhfpacket/msg_mhf_get_achievement.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_additional_beat_reward.go b/network/mhfpacket/msg_mhf_get_additional_beat_reward.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_additional_beat_reward.go rename to network/mhfpacket/msg_mhf_get_additional_beat_reward.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_bbs_sns_status.go b/network/mhfpacket/msg_mhf_get_bbs_sns_status.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_bbs_sns_status.go rename to network/mhfpacket/msg_mhf_get_bbs_sns_status.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_bbs_user_status.go b/network/mhfpacket/msg_mhf_get_bbs_user_status.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_bbs_user_status.go rename to network/mhfpacket/msg_mhf_get_bbs_user_status.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_boost_right.go b/network/mhfpacket/msg_mhf_get_boost_right.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_boost_right.go rename to network/mhfpacket/msg_mhf_get_boost_right.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_boost_time.go b/network/mhfpacket/msg_mhf_get_boost_time.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_boost_time.go rename to network/mhfpacket/msg_mhf_get_boost_time.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_boost_time_limit.go b/network/mhfpacket/msg_mhf_get_boost_time_limit.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_boost_time_limit.go rename to network/mhfpacket/msg_mhf_get_boost_time_limit.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_box_gacha_info.go b/network/mhfpacket/msg_mhf_get_box_gacha_info.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_box_gacha_info.go rename to network/mhfpacket/msg_mhf_get_box_gacha_info.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_break_seibatu_level_reward.go b/network/mhfpacket/msg_mhf_get_break_seibatu_level_reward.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_break_seibatu_level_reward.go rename to network/mhfpacket/msg_mhf_get_break_seibatu_level_reward.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_ca_achievement_hist.go b/network/mhfpacket/msg_mhf_get_ca_achievement_hist.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_ca_achievement_hist.go rename to network/mhfpacket/msg_mhf_get_ca_achievement_hist.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_ca_unique_id.go b/network/mhfpacket/msg_mhf_get_ca_unique_id.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_ca_unique_id.go rename to network/mhfpacket/msg_mhf_get_ca_unique_id.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_cafe_duration.go b/network/mhfpacket/msg_mhf_get_cafe_duration.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_cafe_duration.go rename to network/mhfpacket/msg_mhf_get_cafe_duration.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_cafe_duration_bonus_info.go b/network/mhfpacket/msg_mhf_get_cafe_duration_bonus_info.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_cafe_duration_bonus_info.go rename to network/mhfpacket/msg_mhf_get_cafe_duration_bonus_info.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_cog_info.go b/network/mhfpacket/msg_mhf_get_cog_info.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_cog_info.go rename to network/mhfpacket/msg_mhf_get_cog_info.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_daily_mission_master.go b/network/mhfpacket/msg_mhf_get_daily_mission_master.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_daily_mission_master.go rename to network/mhfpacket/msg_mhf_get_daily_mission_master.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_daily_mission_personal.go b/network/mhfpacket/msg_mhf_get_daily_mission_personal.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_daily_mission_personal.go rename to network/mhfpacket/msg_mhf_get_daily_mission_personal.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_dist_description.go b/network/mhfpacket/msg_mhf_get_dist_description.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_dist_description.go rename to network/mhfpacket/msg_mhf_get_dist_description.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_earth_status.go b/network/mhfpacket/msg_mhf_get_earth_status.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_earth_status.go rename to network/mhfpacket/msg_mhf_get_earth_status.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_earth_value.go b/network/mhfpacket/msg_mhf_get_earth_value.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_earth_value.go rename to network/mhfpacket/msg_mhf_get_earth_value.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_enhanced_minidata.go b/network/mhfpacket/msg_mhf_get_enhanced_minidata.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_enhanced_minidata.go rename to network/mhfpacket/msg_mhf_get_enhanced_minidata.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_equip_skin_hist.go b/network/mhfpacket/msg_mhf_get_equip_skin_hist.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_equip_skin_hist.go rename to network/mhfpacket/msg_mhf_get_equip_skin_hist.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_etc_points.go b/network/mhfpacket/msg_mhf_get_etc_points.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_etc_points.go rename to network/mhfpacket/msg_mhf_get_etc_points.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_extra_info.go b/network/mhfpacket/msg_mhf_get_extra_info.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_extra_info.go rename to network/mhfpacket/msg_mhf_get_extra_info.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_fixed_seibatu_ranking_table.go b/network/mhfpacket/msg_mhf_get_fixed_seibatu_ranking_table.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_fixed_seibatu_ranking_table.go rename to network/mhfpacket/msg_mhf_get_fixed_seibatu_ranking_table.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_fpoint_exchange_list.go b/network/mhfpacket/msg_mhf_get_fpoint_exchange_list.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_fpoint_exchange_list.go rename to network/mhfpacket/msg_mhf_get_fpoint_exchange_list.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_gacha_play_history.go b/network/mhfpacket/msg_mhf_get_gacha_play_history.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_gacha_play_history.go rename to network/mhfpacket/msg_mhf_get_gacha_play_history.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_gacha_point.go b/network/mhfpacket/msg_mhf_get_gacha_point.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_gacha_point.go rename to network/mhfpacket/msg_mhf_get_gacha_point.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_gem_info.go b/network/mhfpacket/msg_mhf_get_gem_info.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_gem_info.go rename to network/mhfpacket/msg_mhf_get_gem_info.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_guild_manage_right.go b/network/mhfpacket/msg_mhf_get_guild_manage_right.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_guild_manage_right.go rename to network/mhfpacket/msg_mhf_get_guild_manage_right.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_guild_mission_list.go b/network/mhfpacket/msg_mhf_get_guild_mission_list.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_guild_mission_list.go rename to network/mhfpacket/msg_mhf_get_guild_mission_list.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_guild_mission_record.go b/network/mhfpacket/msg_mhf_get_guild_mission_record.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_guild_mission_record.go rename to network/mhfpacket/msg_mhf_get_guild_mission_record.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_guild_scout_list.go b/network/mhfpacket/msg_mhf_get_guild_scout_list.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_guild_scout_list.go rename to network/mhfpacket/msg_mhf_get_guild_scout_list.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_guild_target_member_num.go b/network/mhfpacket/msg_mhf_get_guild_target_member_num.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_guild_target_member_num.go rename to network/mhfpacket/msg_mhf_get_guild_target_member_num.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_guild_tresure_souvenir.go b/network/mhfpacket/msg_mhf_get_guild_tresure_souvenir.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_guild_tresure_souvenir.go rename to network/mhfpacket/msg_mhf_get_guild_tresure_souvenir.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_guild_weekly_bonus_active_count.go b/network/mhfpacket/msg_mhf_get_guild_weekly_bonus_active_count.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_guild_weekly_bonus_active_count.go rename to network/mhfpacket/msg_mhf_get_guild_weekly_bonus_active_count.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_guild_weekly_bonus_master.go b/network/mhfpacket/msg_mhf_get_guild_weekly_bonus_master.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_guild_weekly_bonus_master.go rename to network/mhfpacket/msg_mhf_get_guild_weekly_bonus_master.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_keep_login_boost_status.go b/network/mhfpacket/msg_mhf_get_keep_login_boost_status.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_keep_login_boost_status.go rename to network/mhfpacket/msg_mhf_get_keep_login_boost_status.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_kiju_info.go b/network/mhfpacket/msg_mhf_get_kiju_info.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_kiju_info.go rename to network/mhfpacket/msg_mhf_get_kiju_info.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_kouryou_point.go b/network/mhfpacket/msg_mhf_get_kouryou_point.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_kouryou_point.go rename to network/mhfpacket/msg_mhf_get_kouryou_point.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_lobby_crowd.go b/network/mhfpacket/msg_mhf_get_lobby_crowd.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_lobby_crowd.go rename to network/mhfpacket/msg_mhf_get_lobby_crowd.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_myhouse_info.go b/network/mhfpacket/msg_mhf_get_myhouse_info.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_myhouse_info.go rename to network/mhfpacket/msg_mhf_get_myhouse_info.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_notice.go b/network/mhfpacket/msg_mhf_get_notice.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_notice.go rename to network/mhfpacket/msg_mhf_get_notice.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_paper_data.go b/network/mhfpacket/msg_mhf_get_paper_data.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_paper_data.go rename to network/mhfpacket/msg_mhf_get_paper_data.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_rand_from_table.go b/network/mhfpacket/msg_mhf_get_rand_from_table.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_rand_from_table.go rename to network/mhfpacket/msg_mhf_get_rand_from_table.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_reject_guild_scout.go b/network/mhfpacket/msg_mhf_get_reject_guild_scout.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_reject_guild_scout.go rename to network/mhfpacket/msg_mhf_get_reject_guild_scout.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_rengoku_binary.go b/network/mhfpacket/msg_mhf_get_rengoku_binary.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_rengoku_binary.go rename to network/mhfpacket/msg_mhf_get_rengoku_binary.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_rengoku_ranking_rank.go b/network/mhfpacket/msg_mhf_get_rengoku_ranking_rank.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_rengoku_ranking_rank.go rename to network/mhfpacket/msg_mhf_get_rengoku_ranking_rank.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_restriction_event.go b/network/mhfpacket/msg_mhf_get_restriction_event.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_restriction_event.go rename to network/mhfpacket/msg_mhf_get_restriction_event.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_reward_song.go b/network/mhfpacket/msg_mhf_get_reward_song.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_reward_song.go rename to network/mhfpacket/msg_mhf_get_reward_song.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_ryoudama.go b/network/mhfpacket/msg_mhf_get_ryoudama.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_ryoudama.go rename to network/mhfpacket/msg_mhf_get_ryoudama.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_seibattle.go b/network/mhfpacket/msg_mhf_get_seibattle.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_seibattle.go rename to network/mhfpacket/msg_mhf_get_seibattle.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_senyu_daily_count.go b/network/mhfpacket/msg_mhf_get_senyu_daily_count.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_senyu_daily_count.go rename to network/mhfpacket/msg_mhf_get_senyu_daily_count.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_stepup_status.go b/network/mhfpacket/msg_mhf_get_stepup_status.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_stepup_status.go rename to network/mhfpacket/msg_mhf_get_stepup_status.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_tenrouirai.go b/network/mhfpacket/msg_mhf_get_tenrouirai.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_tenrouirai.go rename to network/mhfpacket/msg_mhf_get_tenrouirai.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_tiny_bin.go b/network/mhfpacket/msg_mhf_get_tiny_bin.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_tiny_bin.go rename to network/mhfpacket/msg_mhf_get_tiny_bin.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_tower_info.go b/network/mhfpacket/msg_mhf_get_tower_info.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_tower_info.go rename to network/mhfpacket/msg_mhf_get_tower_info.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_trend_weapon.go b/network/mhfpacket/msg_mhf_get_trend_weapon.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_trend_weapon.go rename to network/mhfpacket/msg_mhf_get_trend_weapon.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_ud_bonus_quest_info.go b/network/mhfpacket/msg_mhf_get_ud_bonus_quest_info.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_ud_bonus_quest_info.go rename to network/mhfpacket/msg_mhf_get_ud_bonus_quest_info.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_ud_daily_present_list.go b/network/mhfpacket/msg_mhf_get_ud_daily_present_list.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_ud_daily_present_list.go rename to network/mhfpacket/msg_mhf_get_ud_daily_present_list.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_ud_guild_map_info.go b/network/mhfpacket/msg_mhf_get_ud_guild_map_info.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_ud_guild_map_info.go rename to network/mhfpacket/msg_mhf_get_ud_guild_map_info.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_ud_info.go b/network/mhfpacket/msg_mhf_get_ud_info.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_ud_info.go rename to network/mhfpacket/msg_mhf_get_ud_info.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_ud_monster_point.go b/network/mhfpacket/msg_mhf_get_ud_monster_point.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_ud_monster_point.go rename to network/mhfpacket/msg_mhf_get_ud_monster_point.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_ud_my_point.go b/network/mhfpacket/msg_mhf_get_ud_my_point.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_ud_my_point.go rename to network/mhfpacket/msg_mhf_get_ud_my_point.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_ud_my_ranking.go b/network/mhfpacket/msg_mhf_get_ud_my_ranking.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_ud_my_ranking.go rename to network/mhfpacket/msg_mhf_get_ud_my_ranking.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_ud_norma_present_list.go b/network/mhfpacket/msg_mhf_get_ud_norma_present_list.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_ud_norma_present_list.go rename to network/mhfpacket/msg_mhf_get_ud_norma_present_list.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_ud_ranking.go b/network/mhfpacket/msg_mhf_get_ud_ranking.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_ud_ranking.go rename to network/mhfpacket/msg_mhf_get_ud_ranking.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_ud_ranking_reward_list.go b/network/mhfpacket/msg_mhf_get_ud_ranking_reward_list.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_ud_ranking_reward_list.go rename to network/mhfpacket/msg_mhf_get_ud_ranking_reward_list.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_ud_schedule.go b/network/mhfpacket/msg_mhf_get_ud_schedule.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_ud_schedule.go rename to network/mhfpacket/msg_mhf_get_ud_schedule.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_ud_selected_color_info.go b/network/mhfpacket/msg_mhf_get_ud_selected_color_info.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_ud_selected_color_info.go rename to network/mhfpacket/msg_mhf_get_ud_selected_color_info.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_ud_shop_coin.go b/network/mhfpacket/msg_mhf_get_ud_shop_coin.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_ud_shop_coin.go rename to network/mhfpacket/msg_mhf_get_ud_shop_coin.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_ud_tactics_bonus_quest.go b/network/mhfpacket/msg_mhf_get_ud_tactics_bonus_quest.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_ud_tactics_bonus_quest.go rename to network/mhfpacket/msg_mhf_get_ud_tactics_bonus_quest.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_ud_tactics_first_quest_bonus.go b/network/mhfpacket/msg_mhf_get_ud_tactics_first_quest_bonus.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_ud_tactics_first_quest_bonus.go rename to network/mhfpacket/msg_mhf_get_ud_tactics_first_quest_bonus.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_ud_tactics_follower.go b/network/mhfpacket/msg_mhf_get_ud_tactics_follower.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_ud_tactics_follower.go rename to network/mhfpacket/msg_mhf_get_ud_tactics_follower.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_ud_tactics_log.go b/network/mhfpacket/msg_mhf_get_ud_tactics_log.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_ud_tactics_log.go rename to network/mhfpacket/msg_mhf_get_ud_tactics_log.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_ud_tactics_point.go b/network/mhfpacket/msg_mhf_get_ud_tactics_point.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_ud_tactics_point.go rename to network/mhfpacket/msg_mhf_get_ud_tactics_point.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_ud_tactics_ranking.go b/network/mhfpacket/msg_mhf_get_ud_tactics_ranking.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_ud_tactics_ranking.go rename to network/mhfpacket/msg_mhf_get_ud_tactics_ranking.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_ud_tactics_remaining_point.go b/network/mhfpacket/msg_mhf_get_ud_tactics_remaining_point.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_ud_tactics_remaining_point.go rename to network/mhfpacket/msg_mhf_get_ud_tactics_remaining_point.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_ud_tactics_reward_list.go b/network/mhfpacket/msg_mhf_get_ud_tactics_reward_list.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_ud_tactics_reward_list.go rename to network/mhfpacket/msg_mhf_get_ud_tactics_reward_list.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_ud_total_point_info.go b/network/mhfpacket/msg_mhf_get_ud_total_point_info.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_ud_total_point_info.go rename to network/mhfpacket/msg_mhf_get_ud_total_point_info.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_weekly_schedule.go b/network/mhfpacket/msg_mhf_get_weekly_schedule.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_weekly_schedule.go rename to network/mhfpacket/msg_mhf_get_weekly_schedule.go diff --git a/Erupe/network/mhfpacket/msg_mhf_get_weekly_seibatu_ranking_reward.go b/network/mhfpacket/msg_mhf_get_weekly_seibatu_ranking_reward.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_get_weekly_seibatu_ranking_reward.go rename to network/mhfpacket/msg_mhf_get_weekly_seibatu_ranking_reward.go diff --git a/Erupe/network/mhfpacket/msg_mhf_guild_huntdata.go b/network/mhfpacket/msg_mhf_guild_huntdata.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_guild_huntdata.go rename to network/mhfpacket/msg_mhf_guild_huntdata.go diff --git a/Erupe/network/mhfpacket/msg_mhf_info_festa.go b/network/mhfpacket/msg_mhf_info_festa.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_info_festa.go rename to network/mhfpacket/msg_mhf_info_festa.go diff --git a/Erupe/network/mhfpacket/msg_mhf_info_guild.go b/network/mhfpacket/msg_mhf_info_guild.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_info_guild.go rename to network/mhfpacket/msg_mhf_info_guild.go diff --git a/Erupe/network/mhfpacket/msg_mhf_info_joint.go b/network/mhfpacket/msg_mhf_info_joint.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_info_joint.go rename to network/mhfpacket/msg_mhf_info_joint.go diff --git a/Erupe/network/mhfpacket/msg_mhf_info_scenario_counter.go b/network/mhfpacket/msg_mhf_info_scenario_counter.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_info_scenario_counter.go rename to network/mhfpacket/msg_mhf_info_scenario_counter.go diff --git a/Erupe/network/mhfpacket/msg_mhf_info_tournament.go b/network/mhfpacket/msg_mhf_info_tournament.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_info_tournament.go rename to network/mhfpacket/msg_mhf_info_tournament.go diff --git a/Erupe/network/mhfpacket/msg_mhf_kick_export_force.go b/network/mhfpacket/msg_mhf_kick_export_force.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_kick_export_force.go rename to network/mhfpacket/msg_mhf_kick_export_force.go diff --git a/Erupe/network/mhfpacket/msg_mhf_list_mail.go b/network/mhfpacket/msg_mhf_list_mail.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_list_mail.go rename to network/mhfpacket/msg_mhf_list_mail.go diff --git a/Erupe/network/mhfpacket/msg_mhf_list_member.go b/network/mhfpacket/msg_mhf_list_member.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_list_member.go rename to network/mhfpacket/msg_mhf_list_member.go diff --git a/Erupe/network/mhfpacket/msg_mhf_load_deco_myset.go b/network/mhfpacket/msg_mhf_load_deco_myset.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_load_deco_myset.go rename to network/mhfpacket/msg_mhf_load_deco_myset.go diff --git a/Erupe/network/mhfpacket/msg_mhf_load_favorite_quest.go b/network/mhfpacket/msg_mhf_load_favorite_quest.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_load_favorite_quest.go rename to network/mhfpacket/msg_mhf_load_favorite_quest.go diff --git a/Erupe/network/mhfpacket/msg_mhf_load_guild_adventure.go b/network/mhfpacket/msg_mhf_load_guild_adventure.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_load_guild_adventure.go rename to network/mhfpacket/msg_mhf_load_guild_adventure.go diff --git a/Erupe/network/mhfpacket/msg_mhf_load_guild_cooking.go b/network/mhfpacket/msg_mhf_load_guild_cooking.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_load_guild_cooking.go rename to network/mhfpacket/msg_mhf_load_guild_cooking.go diff --git a/Erupe/network/mhfpacket/msg_mhf_load_house.go b/network/mhfpacket/msg_mhf_load_house.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_load_house.go rename to network/mhfpacket/msg_mhf_load_house.go diff --git a/Erupe/network/mhfpacket/msg_mhf_load_hunter_navi.go b/network/mhfpacket/msg_mhf_load_hunter_navi.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_load_hunter_navi.go rename to network/mhfpacket/msg_mhf_load_hunter_navi.go diff --git a/Erupe/network/mhfpacket/msg_mhf_load_legend_dispatch.go b/network/mhfpacket/msg_mhf_load_legend_dispatch.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_load_legend_dispatch.go rename to network/mhfpacket/msg_mhf_load_legend_dispatch.go diff --git a/Erupe/network/mhfpacket/msg_mhf_load_mezfes_data.go b/network/mhfpacket/msg_mhf_load_mezfes_data.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_load_mezfes_data.go rename to network/mhfpacket/msg_mhf_load_mezfes_data.go diff --git a/Erupe/network/mhfpacket/msg_mhf_load_otomo_airou.go b/network/mhfpacket/msg_mhf_load_otomo_airou.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_load_otomo_airou.go rename to network/mhfpacket/msg_mhf_load_otomo_airou.go diff --git a/Erupe/network/mhfpacket/msg_mhf_load_partner.go b/network/mhfpacket/msg_mhf_load_partner.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_load_partner.go rename to network/mhfpacket/msg_mhf_load_partner.go diff --git a/Erupe/network/mhfpacket/msg_mhf_load_plate_box.go b/network/mhfpacket/msg_mhf_load_plate_box.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_load_plate_box.go rename to network/mhfpacket/msg_mhf_load_plate_box.go diff --git a/Erupe/network/mhfpacket/msg_mhf_load_plate_data.go b/network/mhfpacket/msg_mhf_load_plate_data.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_load_plate_data.go rename to network/mhfpacket/msg_mhf_load_plate_data.go diff --git a/Erupe/network/mhfpacket/msg_mhf_load_plate_myset.go b/network/mhfpacket/msg_mhf_load_plate_myset.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_load_plate_myset.go rename to network/mhfpacket/msg_mhf_load_plate_myset.go diff --git a/Erupe/network/mhfpacket/msg_mhf_load_rengoku_data.go b/network/mhfpacket/msg_mhf_load_rengoku_data.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_load_rengoku_data.go rename to network/mhfpacket/msg_mhf_load_rengoku_data.go diff --git a/Erupe/network/mhfpacket/msg_mhf_load_scenario_data.go b/network/mhfpacket/msg_mhf_load_scenario_data.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_load_scenario_data.go rename to network/mhfpacket/msg_mhf_load_scenario_data.go diff --git a/Erupe/network/mhfpacket/msg_mhf_loaddata.go b/network/mhfpacket/msg_mhf_loaddata.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_loaddata.go rename to network/mhfpacket/msg_mhf_loaddata.go diff --git a/Erupe/network/mhfpacket/msg_mhf_mercenary_huntdata.go b/network/mhfpacket/msg_mhf_mercenary_huntdata.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_mercenary_huntdata.go rename to network/mhfpacket/msg_mhf_mercenary_huntdata.go diff --git a/Erupe/network/mhfpacket/msg_mhf_operate_guild.go b/network/mhfpacket/msg_mhf_operate_guild.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_operate_guild.go rename to network/mhfpacket/msg_mhf_operate_guild.go diff --git a/Erupe/network/mhfpacket/msg_mhf_operate_guild_member.go b/network/mhfpacket/msg_mhf_operate_guild_member.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_operate_guild_member.go rename to network/mhfpacket/msg_mhf_operate_guild_member.go diff --git a/Erupe/network/mhfpacket/msg_mhf_operate_guild_tresure_report.go b/network/mhfpacket/msg_mhf_operate_guild_tresure_report.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_operate_guild_tresure_report.go rename to network/mhfpacket/msg_mhf_operate_guild_tresure_report.go diff --git a/Erupe/network/mhfpacket/msg_mhf_operate_joint.go b/network/mhfpacket/msg_mhf_operate_joint.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_operate_joint.go rename to network/mhfpacket/msg_mhf_operate_joint.go diff --git a/Erupe/network/mhfpacket/msg_mhf_operate_warehouse.go b/network/mhfpacket/msg_mhf_operate_warehouse.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_operate_warehouse.go rename to network/mhfpacket/msg_mhf_operate_warehouse.go diff --git a/Erupe/network/mhfpacket/msg_mhf_operation_inv_guild.go b/network/mhfpacket/msg_mhf_operation_inv_guild.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_operation_inv_guild.go rename to network/mhfpacket/msg_mhf_operation_inv_guild.go diff --git a/Erupe/network/mhfpacket/msg_mhf_opr_member.go b/network/mhfpacket/msg_mhf_opr_member.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_opr_member.go rename to network/mhfpacket/msg_mhf_opr_member.go diff --git a/Erupe/network/mhfpacket/msg_mhf_oprt_mail.go b/network/mhfpacket/msg_mhf_oprt_mail.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_oprt_mail.go rename to network/mhfpacket/msg_mhf_oprt_mail.go diff --git a/Erupe/network/mhfpacket/msg_mhf_payment_achievement.go b/network/mhfpacket/msg_mhf_payment_achievement.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_payment_achievement.go rename to network/mhfpacket/msg_mhf_payment_achievement.go diff --git a/Erupe/network/mhfpacket/msg_mhf_play_box_gacha.go b/network/mhfpacket/msg_mhf_play_box_gacha.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_play_box_gacha.go rename to network/mhfpacket/msg_mhf_play_box_gacha.go diff --git a/Erupe/network/mhfpacket/msg_mhf_play_free_gacha.go b/network/mhfpacket/msg_mhf_play_free_gacha.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_play_free_gacha.go rename to network/mhfpacket/msg_mhf_play_free_gacha.go diff --git a/Erupe/network/mhfpacket/msg_mhf_play_normal_gacha.go b/network/mhfpacket/msg_mhf_play_normal_gacha.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_play_normal_gacha.go rename to network/mhfpacket/msg_mhf_play_normal_gacha.go diff --git a/Erupe/network/mhfpacket/msg_mhf_play_stepup_gacha.go b/network/mhfpacket/msg_mhf_play_stepup_gacha.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_play_stepup_gacha.go rename to network/mhfpacket/msg_mhf_play_stepup_gacha.go diff --git a/Erupe/network/mhfpacket/msg_mhf_post_boost_time.go b/network/mhfpacket/msg_mhf_post_boost_time.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_post_boost_time.go rename to network/mhfpacket/msg_mhf_post_boost_time.go diff --git a/Erupe/network/mhfpacket/msg_mhf_post_boost_time_limit.go b/network/mhfpacket/msg_mhf_post_boost_time_limit.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_post_boost_time_limit.go rename to network/mhfpacket/msg_mhf_post_boost_time_limit.go diff --git a/Erupe/network/mhfpacket/msg_mhf_post_boost_time_quest_return.go b/network/mhfpacket/msg_mhf_post_boost_time_quest_return.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_post_boost_time_quest_return.go rename to network/mhfpacket/msg_mhf_post_boost_time_quest_return.go diff --git a/Erupe/network/mhfpacket/msg_mhf_post_cafe_duration_bonus_received.go b/network/mhfpacket/msg_mhf_post_cafe_duration_bonus_received.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_post_cafe_duration_bonus_received.go rename to network/mhfpacket/msg_mhf_post_cafe_duration_bonus_received.go diff --git a/Erupe/network/mhfpacket/msg_mhf_post_gem_info.go b/network/mhfpacket/msg_mhf_post_gem_info.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_post_gem_info.go rename to network/mhfpacket/msg_mhf_post_gem_info.go diff --git a/Erupe/network/mhfpacket/msg_mhf_post_guild_scout.go b/network/mhfpacket/msg_mhf_post_guild_scout.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_post_guild_scout.go rename to network/mhfpacket/msg_mhf_post_guild_scout.go diff --git a/Erupe/network/mhfpacket/msg_mhf_post_notice.go b/network/mhfpacket/msg_mhf_post_notice.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_post_notice.go rename to network/mhfpacket/msg_mhf_post_notice.go diff --git a/Erupe/network/mhfpacket/msg_mhf_post_ryoudama.go b/network/mhfpacket/msg_mhf_post_ryoudama.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_post_ryoudama.go rename to network/mhfpacket/msg_mhf_post_ryoudama.go diff --git a/Erupe/network/mhfpacket/msg_mhf_post_seibattle.go b/network/mhfpacket/msg_mhf_post_seibattle.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_post_seibattle.go rename to network/mhfpacket/msg_mhf_post_seibattle.go diff --git a/Erupe/network/mhfpacket/msg_mhf_post_tenrouirai.go b/network/mhfpacket/msg_mhf_post_tenrouirai.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_post_tenrouirai.go rename to network/mhfpacket/msg_mhf_post_tenrouirai.go diff --git a/Erupe/network/mhfpacket/msg_mhf_post_tiny_bin.go b/network/mhfpacket/msg_mhf_post_tiny_bin.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_post_tiny_bin.go rename to network/mhfpacket/msg_mhf_post_tiny_bin.go diff --git a/Erupe/network/mhfpacket/msg_mhf_post_tower_info.go b/network/mhfpacket/msg_mhf_post_tower_info.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_post_tower_info.go rename to network/mhfpacket/msg_mhf_post_tower_info.go diff --git a/Erupe/network/mhfpacket/msg_mhf_present_box.go b/network/mhfpacket/msg_mhf_present_box.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_present_box.go rename to network/mhfpacket/msg_mhf_present_box.go diff --git a/Erupe/network/mhfpacket/msg_mhf_read_beat_level.go b/network/mhfpacket/msg_mhf_read_beat_level.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_read_beat_level.go rename to network/mhfpacket/msg_mhf_read_beat_level.go diff --git a/Erupe/network/mhfpacket/msg_mhf_read_beat_level_all_ranking.go b/network/mhfpacket/msg_mhf_read_beat_level_all_ranking.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_read_beat_level_all_ranking.go rename to network/mhfpacket/msg_mhf_read_beat_level_all_ranking.go diff --git a/Erupe/network/mhfpacket/msg_mhf_read_beat_level_my_ranking.go b/network/mhfpacket/msg_mhf_read_beat_level_my_ranking.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_read_beat_level_my_ranking.go rename to network/mhfpacket/msg_mhf_read_beat_level_my_ranking.go diff --git a/Erupe/network/mhfpacket/msg_mhf_read_guildcard.go b/network/mhfpacket/msg_mhf_read_guildcard.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_read_guildcard.go rename to network/mhfpacket/msg_mhf_read_guildcard.go diff --git a/Erupe/network/mhfpacket/msg_mhf_read_last_week_beat_ranking.go b/network/mhfpacket/msg_mhf_read_last_week_beat_ranking.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_read_last_week_beat_ranking.go rename to network/mhfpacket/msg_mhf_read_last_week_beat_ranking.go diff --git a/Erupe/network/mhfpacket/msg_mhf_read_mail.go b/network/mhfpacket/msg_mhf_read_mail.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_read_mail.go rename to network/mhfpacket/msg_mhf_read_mail.go diff --git a/Erupe/network/mhfpacket/msg_mhf_read_mercenary_m.go b/network/mhfpacket/msg_mhf_read_mercenary_m.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_read_mercenary_m.go rename to network/mhfpacket/msg_mhf_read_mercenary_m.go diff --git a/Erupe/network/mhfpacket/msg_mhf_read_mercenary_w.go b/network/mhfpacket/msg_mhf_read_mercenary_w.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_read_mercenary_w.go rename to network/mhfpacket/msg_mhf_read_mercenary_w.go diff --git a/Erupe/network/mhfpacket/msg_mhf_receive_cafe_duration_bonus.go b/network/mhfpacket/msg_mhf_receive_cafe_duration_bonus.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_receive_cafe_duration_bonus.go rename to network/mhfpacket/msg_mhf_receive_cafe_duration_bonus.go diff --git a/Erupe/network/mhfpacket/msg_mhf_receive_gacha_item.go b/network/mhfpacket/msg_mhf_receive_gacha_item.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_receive_gacha_item.go rename to network/mhfpacket/msg_mhf_receive_gacha_item.go diff --git a/Erupe/network/mhfpacket/msg_mhf_regist_guild_adventure.go b/network/mhfpacket/msg_mhf_regist_guild_adventure.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_regist_guild_adventure.go rename to network/mhfpacket/msg_mhf_regist_guild_adventure.go diff --git a/Erupe/network/mhfpacket/msg_mhf_regist_guild_adventure_diva.go b/network/mhfpacket/msg_mhf_regist_guild_adventure_diva.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_regist_guild_adventure_diva.go rename to network/mhfpacket/msg_mhf_regist_guild_adventure_diva.go diff --git a/Erupe/network/mhfpacket/msg_mhf_regist_guild_cooking.go b/network/mhfpacket/msg_mhf_regist_guild_cooking.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_regist_guild_cooking.go rename to network/mhfpacket/msg_mhf_regist_guild_cooking.go diff --git a/Erupe/network/mhfpacket/msg_mhf_regist_guild_tresure.go b/network/mhfpacket/msg_mhf_regist_guild_tresure.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_regist_guild_tresure.go rename to network/mhfpacket/msg_mhf_regist_guild_tresure.go diff --git a/Erupe/network/mhfpacket/msg_mhf_regist_spabi_time.go b/network/mhfpacket/msg_mhf_regist_spabi_time.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_regist_spabi_time.go rename to network/mhfpacket/msg_mhf_regist_spabi_time.go diff --git a/Erupe/network/mhfpacket/msg_mhf_register_event.go b/network/mhfpacket/msg_mhf_register_event.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_register_event.go rename to network/mhfpacket/msg_mhf_register_event.go diff --git a/Erupe/network/mhfpacket/msg_mhf_release_event.go b/network/mhfpacket/msg_mhf_release_event.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_release_event.go rename to network/mhfpacket/msg_mhf_release_event.go diff --git a/Erupe/network/mhfpacket/msg_mhf_reserve10f.go b/network/mhfpacket/msg_mhf_reserve10f.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_reserve10f.go rename to network/mhfpacket/msg_mhf_reserve10f.go diff --git a/Erupe/network/mhfpacket/msg_mhf_reset_achievement.go b/network/mhfpacket/msg_mhf_reset_achievement.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_reset_achievement.go rename to network/mhfpacket/msg_mhf_reset_achievement.go diff --git a/Erupe/network/mhfpacket/msg_mhf_reset_box_gacha_info.go b/network/mhfpacket/msg_mhf_reset_box_gacha_info.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_reset_box_gacha_info.go rename to network/mhfpacket/msg_mhf_reset_box_gacha_info.go diff --git a/Erupe/network/mhfpacket/msg_mhf_reset_title.go b/network/mhfpacket/msg_mhf_reset_title.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_reset_title.go rename to network/mhfpacket/msg_mhf_reset_title.go diff --git a/Erupe/network/mhfpacket/msg_mhf_save_deco_myset.go b/network/mhfpacket/msg_mhf_save_deco_myset.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_save_deco_myset.go rename to network/mhfpacket/msg_mhf_save_deco_myset.go diff --git a/Erupe/network/mhfpacket/msg_mhf_save_favorite_quest.go b/network/mhfpacket/msg_mhf_save_favorite_quest.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_save_favorite_quest.go rename to network/mhfpacket/msg_mhf_save_favorite_quest.go diff --git a/Erupe/network/mhfpacket/msg_mhf_save_hunter_navi.go b/network/mhfpacket/msg_mhf_save_hunter_navi.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_save_hunter_navi.go rename to network/mhfpacket/msg_mhf_save_hunter_navi.go diff --git a/Erupe/network/mhfpacket/msg_mhf_save_mercenary.go b/network/mhfpacket/msg_mhf_save_mercenary.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_save_mercenary.go rename to network/mhfpacket/msg_mhf_save_mercenary.go diff --git a/Erupe/network/mhfpacket/msg_mhf_save_mezfes_data.go b/network/mhfpacket/msg_mhf_save_mezfes_data.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_save_mezfes_data.go rename to network/mhfpacket/msg_mhf_save_mezfes_data.go diff --git a/Erupe/network/mhfpacket/msg_mhf_save_otomo_airou.go b/network/mhfpacket/msg_mhf_save_otomo_airou.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_save_otomo_airou.go rename to network/mhfpacket/msg_mhf_save_otomo_airou.go diff --git a/Erupe/network/mhfpacket/msg_mhf_save_partner.go b/network/mhfpacket/msg_mhf_save_partner.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_save_partner.go rename to network/mhfpacket/msg_mhf_save_partner.go diff --git a/Erupe/network/mhfpacket/msg_mhf_save_plate_box.go b/network/mhfpacket/msg_mhf_save_plate_box.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_save_plate_box.go rename to network/mhfpacket/msg_mhf_save_plate_box.go diff --git a/Erupe/network/mhfpacket/msg_mhf_save_plate_data.go b/network/mhfpacket/msg_mhf_save_plate_data.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_save_plate_data.go rename to network/mhfpacket/msg_mhf_save_plate_data.go diff --git a/Erupe/network/mhfpacket/msg_mhf_save_plate_myset.go b/network/mhfpacket/msg_mhf_save_plate_myset.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_save_plate_myset.go rename to network/mhfpacket/msg_mhf_save_plate_myset.go diff --git a/Erupe/network/mhfpacket/msg_mhf_save_rengoku_data.go b/network/mhfpacket/msg_mhf_save_rengoku_data.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_save_rengoku_data.go rename to network/mhfpacket/msg_mhf_save_rengoku_data.go diff --git a/Erupe/network/mhfpacket/msg_mhf_save_scenario_data.go b/network/mhfpacket/msg_mhf_save_scenario_data.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_save_scenario_data.go rename to network/mhfpacket/msg_mhf_save_scenario_data.go diff --git a/Erupe/network/mhfpacket/msg_mhf_savedata.go b/network/mhfpacket/msg_mhf_savedata.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_savedata.go rename to network/mhfpacket/msg_mhf_savedata.go diff --git a/Erupe/network/mhfpacket/msg_mhf_send_mail.go b/network/mhfpacket/msg_mhf_send_mail.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_send_mail.go rename to network/mhfpacket/msg_mhf_send_mail.go diff --git a/Erupe/network/mhfpacket/msg_mhf_server_command.go b/network/mhfpacket/msg_mhf_server_command.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_server_command.go rename to network/mhfpacket/msg_mhf_server_command.go diff --git a/Erupe/network/mhfpacket/msg_mhf_set_ca_achievement.go b/network/mhfpacket/msg_mhf_set_ca_achievement.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_set_ca_achievement.go rename to network/mhfpacket/msg_mhf_set_ca_achievement.go diff --git a/Erupe/network/mhfpacket/msg_mhf_set_ca_achievement_hist.go b/network/mhfpacket/msg_mhf_set_ca_achievement_hist.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_set_ca_achievement_hist.go rename to network/mhfpacket/msg_mhf_set_ca_achievement_hist.go diff --git a/Erupe/network/mhfpacket/msg_mhf_set_daily_mission_personal.go b/network/mhfpacket/msg_mhf_set_daily_mission_personal.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_set_daily_mission_personal.go rename to network/mhfpacket/msg_mhf_set_daily_mission_personal.go diff --git a/Erupe/network/mhfpacket/msg_mhf_set_enhanced_minidata.go b/network/mhfpacket/msg_mhf_set_enhanced_minidata.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_set_enhanced_minidata.go rename to network/mhfpacket/msg_mhf_set_enhanced_minidata.go diff --git a/Erupe/network/mhfpacket/msg_mhf_set_guild_manage_right.go b/network/mhfpacket/msg_mhf_set_guild_manage_right.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_set_guild_manage_right.go rename to network/mhfpacket/msg_mhf_set_guild_manage_right.go diff --git a/Erupe/network/mhfpacket/msg_mhf_set_guild_mission_target.go b/network/mhfpacket/msg_mhf_set_guild_mission_target.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_set_guild_mission_target.go rename to network/mhfpacket/msg_mhf_set_guild_mission_target.go diff --git a/Erupe/network/mhfpacket/msg_mhf_set_kiju.go b/network/mhfpacket/msg_mhf_set_kiju.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_set_kiju.go rename to network/mhfpacket/msg_mhf_set_kiju.go diff --git a/Erupe/network/mhfpacket/msg_mhf_set_loginwindow.go b/network/mhfpacket/msg_mhf_set_loginwindow.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_set_loginwindow.go rename to network/mhfpacket/msg_mhf_set_loginwindow.go diff --git a/Erupe/network/mhfpacket/msg_mhf_set_reject_guild_scout.go b/network/mhfpacket/msg_mhf_set_reject_guild_scout.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_set_reject_guild_scout.go rename to network/mhfpacket/msg_mhf_set_reject_guild_scout.go diff --git a/Erupe/network/mhfpacket/msg_mhf_set_restriction_event.go b/network/mhfpacket/msg_mhf_set_restriction_event.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_set_restriction_event.go rename to network/mhfpacket/msg_mhf_set_restriction_event.go diff --git a/Erupe/network/mhfpacket/msg_mhf_set_ud_tactics_follower.go b/network/mhfpacket/msg_mhf_set_ud_tactics_follower.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_set_ud_tactics_follower.go rename to network/mhfpacket/msg_mhf_set_ud_tactics_follower.go diff --git a/Erupe/network/mhfpacket/msg_mhf_sex_changer.go b/network/mhfpacket/msg_mhf_sex_changer.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_sex_changer.go rename to network/mhfpacket/msg_mhf_sex_changer.go diff --git a/Erupe/network/mhfpacket/msg_mhf_shut_client.go b/network/mhfpacket/msg_mhf_shut_client.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_shut_client.go rename to network/mhfpacket/msg_mhf_shut_client.go diff --git a/Erupe/network/mhfpacket/msg_mhf_stampcard_prize.go b/network/mhfpacket/msg_mhf_stampcard_prize.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_stampcard_prize.go rename to network/mhfpacket/msg_mhf_stampcard_prize.go diff --git a/Erupe/network/mhfpacket/msg_mhf_stampcard_stamp.go b/network/mhfpacket/msg_mhf_stampcard_stamp.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_stampcard_stamp.go rename to network/mhfpacket/msg_mhf_stampcard_stamp.go diff --git a/Erupe/network/mhfpacket/msg_mhf_start_boost_time.go b/network/mhfpacket/msg_mhf_start_boost_time.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_start_boost_time.go rename to network/mhfpacket/msg_mhf_start_boost_time.go diff --git a/Erupe/network/mhfpacket/msg_mhf_state_campaign.go b/network/mhfpacket/msg_mhf_state_campaign.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_state_campaign.go rename to network/mhfpacket/msg_mhf_state_campaign.go diff --git a/Erupe/network/mhfpacket/msg_mhf_state_festa_g.go b/network/mhfpacket/msg_mhf_state_festa_g.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_state_festa_g.go rename to network/mhfpacket/msg_mhf_state_festa_g.go diff --git a/Erupe/network/mhfpacket/msg_mhf_state_festa_u.go b/network/mhfpacket/msg_mhf_state_festa_u.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_state_festa_u.go rename to network/mhfpacket/msg_mhf_state_festa_u.go diff --git a/Erupe/network/mhfpacket/msg_mhf_transfer_item.go b/network/mhfpacket/msg_mhf_transfer_item.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_transfer_item.go rename to network/mhfpacket/msg_mhf_transfer_item.go diff --git a/Erupe/network/mhfpacket/msg_mhf_transit_message.go b/network/mhfpacket/msg_mhf_transit_message.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_transit_message.go rename to network/mhfpacket/msg_mhf_transit_message.go diff --git a/Erupe/network/mhfpacket/msg_mhf_unreserve_srg.go b/network/mhfpacket/msg_mhf_unreserve_srg.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_unreserve_srg.go rename to network/mhfpacket/msg_mhf_unreserve_srg.go diff --git a/Erupe/network/mhfpacket/msg_mhf_update_beat_level.go b/network/mhfpacket/msg_mhf_update_beat_level.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_update_beat_level.go rename to network/mhfpacket/msg_mhf_update_beat_level.go diff --git a/Erupe/network/mhfpacket/msg_mhf_update_cafepoint.go b/network/mhfpacket/msg_mhf_update_cafepoint.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_update_cafepoint.go rename to network/mhfpacket/msg_mhf_update_cafepoint.go diff --git a/Erupe/network/mhfpacket/msg_mhf_update_equip_skin_hist.go b/network/mhfpacket/msg_mhf_update_equip_skin_hist.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_update_equip_skin_hist.go rename to network/mhfpacket/msg_mhf_update_equip_skin_hist.go diff --git a/Erupe/network/mhfpacket/msg_mhf_update_etc_point.go b/network/mhfpacket/msg_mhf_update_etc_point.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_update_etc_point.go rename to network/mhfpacket/msg_mhf_update_etc_point.go diff --git a/Erupe/network/mhfpacket/msg_mhf_update_force_guild_rank.go b/network/mhfpacket/msg_mhf_update_force_guild_rank.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_update_force_guild_rank.go rename to network/mhfpacket/msg_mhf_update_force_guild_rank.go diff --git a/Erupe/network/mhfpacket/msg_mhf_update_guacot.go b/network/mhfpacket/msg_mhf_update_guacot.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_update_guacot.go rename to network/mhfpacket/msg_mhf_update_guacot.go diff --git a/Erupe/network/mhfpacket/msg_mhf_update_guild.go b/network/mhfpacket/msg_mhf_update_guild.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_update_guild.go rename to network/mhfpacket/msg_mhf_update_guild.go diff --git a/Erupe/network/mhfpacket/msg_mhf_update_guild_icon.go b/network/mhfpacket/msg_mhf_update_guild_icon.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_update_guild_icon.go rename to network/mhfpacket/msg_mhf_update_guild_icon.go diff --git a/Erupe/network/mhfpacket/msg_mhf_update_guild_item.go b/network/mhfpacket/msg_mhf_update_guild_item.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_update_guild_item.go rename to network/mhfpacket/msg_mhf_update_guild_item.go diff --git a/Erupe/network/mhfpacket/msg_mhf_update_guild_message_board.go b/network/mhfpacket/msg_mhf_update_guild_message_board.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_update_guild_message_board.go rename to network/mhfpacket/msg_mhf_update_guild_message_board.go diff --git a/Erupe/network/mhfpacket/msg_mhf_update_guildcard.go b/network/mhfpacket/msg_mhf_update_guildcard.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_update_guildcard.go rename to network/mhfpacket/msg_mhf_update_guildcard.go diff --git a/Erupe/network/mhfpacket/msg_mhf_update_house.go b/network/mhfpacket/msg_mhf_update_house.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_update_house.go rename to network/mhfpacket/msg_mhf_update_house.go diff --git a/Erupe/network/mhfpacket/msg_mhf_update_interior.go b/network/mhfpacket/msg_mhf_update_interior.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_update_interior.go rename to network/mhfpacket/msg_mhf_update_interior.go diff --git a/Erupe/network/mhfpacket/msg_mhf_update_myhouse_info.go b/network/mhfpacket/msg_mhf_update_myhouse_info.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_update_myhouse_info.go rename to network/mhfpacket/msg_mhf_update_myhouse_info.go diff --git a/Erupe/network/mhfpacket/msg_mhf_update_union_item.go b/network/mhfpacket/msg_mhf_update_union_item.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_update_union_item.go rename to network/mhfpacket/msg_mhf_update_union_item.go diff --git a/Erupe/network/mhfpacket/msg_mhf_update_use_trend_weapon_log.go b/network/mhfpacket/msg_mhf_update_use_trend_weapon_log.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_update_use_trend_weapon_log.go rename to network/mhfpacket/msg_mhf_update_use_trend_weapon_log.go diff --git a/Erupe/network/mhfpacket/msg_mhf_update_warehouse.go b/network/mhfpacket/msg_mhf_update_warehouse.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_update_warehouse.go rename to network/mhfpacket/msg_mhf_update_warehouse.go diff --git a/Erupe/network/mhfpacket/msg_mhf_use_gacha_point.go b/network/mhfpacket/msg_mhf_use_gacha_point.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_use_gacha_point.go rename to network/mhfpacket/msg_mhf_use_gacha_point.go diff --git a/Erupe/network/mhfpacket/msg_mhf_use_keep_login_boost.go b/network/mhfpacket/msg_mhf_use_keep_login_boost.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_use_keep_login_boost.go rename to network/mhfpacket/msg_mhf_use_keep_login_boost.go diff --git a/Erupe/network/mhfpacket/msg_mhf_use_reward_song.go b/network/mhfpacket/msg_mhf_use_reward_song.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_use_reward_song.go rename to network/mhfpacket/msg_mhf_use_reward_song.go diff --git a/Erupe/network/mhfpacket/msg_mhf_use_ud_shop_coin.go b/network/mhfpacket/msg_mhf_use_ud_shop_coin.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_use_ud_shop_coin.go rename to network/mhfpacket/msg_mhf_use_ud_shop_coin.go diff --git a/Erupe/network/mhfpacket/msg_mhf_vote_festa.go b/network/mhfpacket/msg_mhf_vote_festa.go similarity index 100% rename from Erupe/network/mhfpacket/msg_mhf_vote_festa.go rename to network/mhfpacket/msg_mhf_vote_festa.go diff --git a/Erupe/network/mhfpacket/msg_sys_ack.go b/network/mhfpacket/msg_sys_ack.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_ack.go rename to network/mhfpacket/msg_sys_ack.go diff --git a/Erupe/network/mhfpacket/msg_sys_acquire_semaphore.go b/network/mhfpacket/msg_sys_acquire_semaphore.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_acquire_semaphore.go rename to network/mhfpacket/msg_sys_acquire_semaphore.go diff --git a/Erupe/network/mhfpacket/msg_sys_add_object.go b/network/mhfpacket/msg_sys_add_object.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_add_object.go rename to network/mhfpacket/msg_sys_add_object.go diff --git a/Erupe/network/mhfpacket/msg_sys_auth_data.go b/network/mhfpacket/msg_sys_auth_data.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_auth_data.go rename to network/mhfpacket/msg_sys_auth_data.go diff --git a/Erupe/network/mhfpacket/msg_sys_auth_query.go b/network/mhfpacket/msg_sys_auth_query.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_auth_query.go rename to network/mhfpacket/msg_sys_auth_query.go diff --git a/Erupe/network/mhfpacket/msg_sys_auth_terminal.go b/network/mhfpacket/msg_sys_auth_terminal.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_auth_terminal.go rename to network/mhfpacket/msg_sys_auth_terminal.go diff --git a/Erupe/network/mhfpacket/msg_sys_back_stage.go b/network/mhfpacket/msg_sys_back_stage.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_back_stage.go rename to network/mhfpacket/msg_sys_back_stage.go diff --git a/Erupe/network/mhfpacket/msg_sys_cast_binary.go b/network/mhfpacket/msg_sys_cast_binary.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_cast_binary.go rename to network/mhfpacket/msg_sys_cast_binary.go diff --git a/Erupe/network/mhfpacket/msg_sys_casted_binary.go b/network/mhfpacket/msg_sys_casted_binary.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_casted_binary.go rename to network/mhfpacket/msg_sys_casted_binary.go diff --git a/Erupe/network/mhfpacket/msg_sys_check_semaphore.go b/network/mhfpacket/msg_sys_check_semaphore.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_check_semaphore.go rename to network/mhfpacket/msg_sys_check_semaphore.go diff --git a/Erupe/network/mhfpacket/msg_sys_cleanup_object.go b/network/mhfpacket/msg_sys_cleanup_object.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_cleanup_object.go rename to network/mhfpacket/msg_sys_cleanup_object.go diff --git a/Erupe/network/mhfpacket/msg_sys_close_mutex.go b/network/mhfpacket/msg_sys_close_mutex.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_close_mutex.go rename to network/mhfpacket/msg_sys_close_mutex.go diff --git a/Erupe/network/mhfpacket/msg_sys_collect_binary.go b/network/mhfpacket/msg_sys_collect_binary.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_collect_binary.go rename to network/mhfpacket/msg_sys_collect_binary.go diff --git a/Erupe/network/mhfpacket/msg_sys_create_acquire_semaphore.go b/network/mhfpacket/msg_sys_create_acquire_semaphore.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_create_acquire_semaphore.go rename to network/mhfpacket/msg_sys_create_acquire_semaphore.go diff --git a/Erupe/network/mhfpacket/msg_sys_create_mutex.go b/network/mhfpacket/msg_sys_create_mutex.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_create_mutex.go rename to network/mhfpacket/msg_sys_create_mutex.go diff --git a/Erupe/network/mhfpacket/msg_sys_create_object.go b/network/mhfpacket/msg_sys_create_object.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_create_object.go rename to network/mhfpacket/msg_sys_create_object.go diff --git a/Erupe/network/mhfpacket/msg_sys_create_open_mutex.go b/network/mhfpacket/msg_sys_create_open_mutex.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_create_open_mutex.go rename to network/mhfpacket/msg_sys_create_open_mutex.go diff --git a/Erupe/network/mhfpacket/msg_sys_create_semaphore.go b/network/mhfpacket/msg_sys_create_semaphore.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_create_semaphore.go rename to network/mhfpacket/msg_sys_create_semaphore.go diff --git a/Erupe/network/mhfpacket/msg_sys_create_stage.go b/network/mhfpacket/msg_sys_create_stage.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_create_stage.go rename to network/mhfpacket/msg_sys_create_stage.go diff --git a/Erupe/network/mhfpacket/msg_sys_del_object.go b/network/mhfpacket/msg_sys_del_object.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_del_object.go rename to network/mhfpacket/msg_sys_del_object.go diff --git a/Erupe/network/mhfpacket/msg_sys_delete_mutex.go b/network/mhfpacket/msg_sys_delete_mutex.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_delete_mutex.go rename to network/mhfpacket/msg_sys_delete_mutex.go diff --git a/Erupe/network/mhfpacket/msg_sys_delete_object.go b/network/mhfpacket/msg_sys_delete_object.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_delete_object.go rename to network/mhfpacket/msg_sys_delete_object.go diff --git a/Erupe/network/mhfpacket/msg_sys_delete_semaphore.go b/network/mhfpacket/msg_sys_delete_semaphore.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_delete_semaphore.go rename to network/mhfpacket/msg_sys_delete_semaphore.go diff --git a/Erupe/network/mhfpacket/msg_sys_delete_user.go b/network/mhfpacket/msg_sys_delete_user.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_delete_user.go rename to network/mhfpacket/msg_sys_delete_user.go diff --git a/Erupe/network/mhfpacket/msg_sys_disp_object.go b/network/mhfpacket/msg_sys_disp_object.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_disp_object.go rename to network/mhfpacket/msg_sys_disp_object.go diff --git a/Erupe/network/mhfpacket/msg_sys_duplicate_object.go b/network/mhfpacket/msg_sys_duplicate_object.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_duplicate_object.go rename to network/mhfpacket/msg_sys_duplicate_object.go diff --git a/Erupe/network/mhfpacket/msg_sys_echo.go b/network/mhfpacket/msg_sys_echo.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_echo.go rename to network/mhfpacket/msg_sys_echo.go diff --git a/Erupe/network/mhfpacket/msg_sys_end.go b/network/mhfpacket/msg_sys_end.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_end.go rename to network/mhfpacket/msg_sys_end.go diff --git a/Erupe/network/mhfpacket/msg_sys_enter_stage.go b/network/mhfpacket/msg_sys_enter_stage.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_enter_stage.go rename to network/mhfpacket/msg_sys_enter_stage.go diff --git a/Erupe/network/mhfpacket/msg_sys_enumerate_client.go b/network/mhfpacket/msg_sys_enumerate_client.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_enumerate_client.go rename to network/mhfpacket/msg_sys_enumerate_client.go diff --git a/Erupe/network/mhfpacket/msg_sys_enumerate_stage.go b/network/mhfpacket/msg_sys_enumerate_stage.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_enumerate_stage.go rename to network/mhfpacket/msg_sys_enumerate_stage.go diff --git a/Erupe/network/mhfpacket/msg_sys_enumlobby.go b/network/mhfpacket/msg_sys_enumlobby.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_enumlobby.go rename to network/mhfpacket/msg_sys_enumlobby.go diff --git a/Erupe/network/mhfpacket/msg_sys_enumuser.go b/network/mhfpacket/msg_sys_enumuser.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_enumuser.go rename to network/mhfpacket/msg_sys_enumuser.go diff --git a/Erupe/network/mhfpacket/msg_sys_extend_threshold.go b/network/mhfpacket/msg_sys_extend_threshold.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_extend_threshold.go rename to network/mhfpacket/msg_sys_extend_threshold.go diff --git a/Erupe/network/mhfpacket/msg_sys_get_file.go b/network/mhfpacket/msg_sys_get_file.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_get_file.go rename to network/mhfpacket/msg_sys_get_file.go diff --git a/Erupe/network/mhfpacket/msg_sys_get_object_binary.go b/network/mhfpacket/msg_sys_get_object_binary.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_get_object_binary.go rename to network/mhfpacket/msg_sys_get_object_binary.go diff --git a/Erupe/network/mhfpacket/msg_sys_get_object_owner.go b/network/mhfpacket/msg_sys_get_object_owner.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_get_object_owner.go rename to network/mhfpacket/msg_sys_get_object_owner.go diff --git a/Erupe/network/mhfpacket/msg_sys_get_stage_binary.go b/network/mhfpacket/msg_sys_get_stage_binary.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_get_stage_binary.go rename to network/mhfpacket/msg_sys_get_stage_binary.go diff --git a/Erupe/network/mhfpacket/msg_sys_get_state.go b/network/mhfpacket/msg_sys_get_state.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_get_state.go rename to network/mhfpacket/msg_sys_get_state.go diff --git a/Erupe/network/mhfpacket/msg_sys_get_user_binary.go b/network/mhfpacket/msg_sys_get_user_binary.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_get_user_binary.go rename to network/mhfpacket/msg_sys_get_user_binary.go diff --git a/Erupe/network/mhfpacket/msg_sys_hide_client.go b/network/mhfpacket/msg_sys_hide_client.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_hide_client.go rename to network/mhfpacket/msg_sys_hide_client.go diff --git a/Erupe/network/mhfpacket/msg_sys_hide_object.go b/network/mhfpacket/msg_sys_hide_object.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_hide_object.go rename to network/mhfpacket/msg_sys_hide_object.go diff --git a/Erupe/network/mhfpacket/msg_sys_infokyserver.go b/network/mhfpacket/msg_sys_infokyserver.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_infokyserver.go rename to network/mhfpacket/msg_sys_infokyserver.go diff --git a/Erupe/network/mhfpacket/msg_sys_insert_user.go b/network/mhfpacket/msg_sys_insert_user.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_insert_user.go rename to network/mhfpacket/msg_sys_insert_user.go diff --git a/Erupe/network/mhfpacket/msg_sys_issue_logkey.go b/network/mhfpacket/msg_sys_issue_logkey.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_issue_logkey.go rename to network/mhfpacket/msg_sys_issue_logkey.go diff --git a/Erupe/network/mhfpacket/msg_sys_leave_stage.go b/network/mhfpacket/msg_sys_leave_stage.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_leave_stage.go rename to network/mhfpacket/msg_sys_leave_stage.go diff --git a/Erupe/network/mhfpacket/msg_sys_load_register.go b/network/mhfpacket/msg_sys_load_register.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_load_register.go rename to network/mhfpacket/msg_sys_load_register.go diff --git a/Erupe/network/mhfpacket/msg_sys_lock_global_sema.go b/network/mhfpacket/msg_sys_lock_global_sema.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_lock_global_sema.go rename to network/mhfpacket/msg_sys_lock_global_sema.go diff --git a/Erupe/network/mhfpacket/msg_sys_lock_stage.go b/network/mhfpacket/msg_sys_lock_stage.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_lock_stage.go rename to network/mhfpacket/msg_sys_lock_stage.go diff --git a/Erupe/network/mhfpacket/msg_sys_login.go b/network/mhfpacket/msg_sys_login.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_login.go rename to network/mhfpacket/msg_sys_login.go diff --git a/Erupe/network/mhfpacket/msg_sys_logout.go b/network/mhfpacket/msg_sys_logout.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_logout.go rename to network/mhfpacket/msg_sys_logout.go diff --git a/Erupe/network/mhfpacket/msg_sys_move_stage.go b/network/mhfpacket/msg_sys_move_stage.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_move_stage.go rename to network/mhfpacket/msg_sys_move_stage.go diff --git a/Erupe/network/mhfpacket/msg_sys_nop.go b/network/mhfpacket/msg_sys_nop.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_nop.go rename to network/mhfpacket/msg_sys_nop.go diff --git a/Erupe/network/mhfpacket/msg_sys_notify_register.go b/network/mhfpacket/msg_sys_notify_register.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_notify_register.go rename to network/mhfpacket/msg_sys_notify_register.go diff --git a/Erupe/network/mhfpacket/msg_sys_notify_user_binary.go b/network/mhfpacket/msg_sys_notify_user_binary.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_notify_user_binary.go rename to network/mhfpacket/msg_sys_notify_user_binary.go diff --git a/Erupe/network/mhfpacket/msg_sys_open_mutex.go b/network/mhfpacket/msg_sys_open_mutex.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_open_mutex.go rename to network/mhfpacket/msg_sys_open_mutex.go diff --git a/Erupe/network/mhfpacket/msg_sys_operate_register.go b/network/mhfpacket/msg_sys_operate_register.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_operate_register.go rename to network/mhfpacket/msg_sys_operate_register.go diff --git a/Erupe/network/mhfpacket/msg_sys_ping.go b/network/mhfpacket/msg_sys_ping.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_ping.go rename to network/mhfpacket/msg_sys_ping.go diff --git a/Erupe/network/mhfpacket/msg_sys_position_object.go b/network/mhfpacket/msg_sys_position_object.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_position_object.go rename to network/mhfpacket/msg_sys_position_object.go diff --git a/Erupe/network/mhfpacket/msg_sys_record_log.go b/network/mhfpacket/msg_sys_record_log.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_record_log.go rename to network/mhfpacket/msg_sys_record_log.go diff --git a/Erupe/network/mhfpacket/msg_sys_release_semaphore.go b/network/mhfpacket/msg_sys_release_semaphore.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_release_semaphore.go rename to network/mhfpacket/msg_sys_release_semaphore.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve01.go b/network/mhfpacket/msg_sys_reserve01.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve01.go rename to network/mhfpacket/msg_sys_reserve01.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve02.go b/network/mhfpacket/msg_sys_reserve02.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve02.go rename to network/mhfpacket/msg_sys_reserve02.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve03.go b/network/mhfpacket/msg_sys_reserve03.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve03.go rename to network/mhfpacket/msg_sys_reserve03.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve04.go b/network/mhfpacket/msg_sys_reserve04.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve04.go rename to network/mhfpacket/msg_sys_reserve04.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve05.go b/network/mhfpacket/msg_sys_reserve05.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve05.go rename to network/mhfpacket/msg_sys_reserve05.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve06.go b/network/mhfpacket/msg_sys_reserve06.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve06.go rename to network/mhfpacket/msg_sys_reserve06.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve07.go b/network/mhfpacket/msg_sys_reserve07.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve07.go rename to network/mhfpacket/msg_sys_reserve07.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve0c.go b/network/mhfpacket/msg_sys_reserve0c.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve0c.go rename to network/mhfpacket/msg_sys_reserve0c.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve0d.go b/network/mhfpacket/msg_sys_reserve0d.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve0d.go rename to network/mhfpacket/msg_sys_reserve0d.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve0e.go b/network/mhfpacket/msg_sys_reserve0e.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve0e.go rename to network/mhfpacket/msg_sys_reserve0e.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve180.go b/network/mhfpacket/msg_sys_reserve180.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve180.go rename to network/mhfpacket/msg_sys_reserve180.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve188.go b/network/mhfpacket/msg_sys_reserve188.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve188.go rename to network/mhfpacket/msg_sys_reserve188.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve18b.go b/network/mhfpacket/msg_sys_reserve18b.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve18b.go rename to network/mhfpacket/msg_sys_reserve18b.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve18e.go b/network/mhfpacket/msg_sys_reserve18e.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve18e.go rename to network/mhfpacket/msg_sys_reserve18e.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve18f.go b/network/mhfpacket/msg_sys_reserve18f.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve18f.go rename to network/mhfpacket/msg_sys_reserve18f.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve192.go b/network/mhfpacket/msg_sys_reserve192.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve192.go rename to network/mhfpacket/msg_sys_reserve192.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve193.go b/network/mhfpacket/msg_sys_reserve193.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve193.go rename to network/mhfpacket/msg_sys_reserve193.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve194.go b/network/mhfpacket/msg_sys_reserve194.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve194.go rename to network/mhfpacket/msg_sys_reserve194.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve19b.go b/network/mhfpacket/msg_sys_reserve19b.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve19b.go rename to network/mhfpacket/msg_sys_reserve19b.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve19e.go b/network/mhfpacket/msg_sys_reserve19e.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve19e.go rename to network/mhfpacket/msg_sys_reserve19e.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve19f.go b/network/mhfpacket/msg_sys_reserve19f.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve19f.go rename to network/mhfpacket/msg_sys_reserve19f.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve1a4.go b/network/mhfpacket/msg_sys_reserve1a4.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve1a4.go rename to network/mhfpacket/msg_sys_reserve1a4.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve1a6.go b/network/mhfpacket/msg_sys_reserve1a6.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve1a6.go rename to network/mhfpacket/msg_sys_reserve1a6.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve1a7.go b/network/mhfpacket/msg_sys_reserve1a7.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve1a7.go rename to network/mhfpacket/msg_sys_reserve1a7.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve1a8.go b/network/mhfpacket/msg_sys_reserve1a8.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve1a8.go rename to network/mhfpacket/msg_sys_reserve1a8.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve1a9.go b/network/mhfpacket/msg_sys_reserve1a9.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve1a9.go rename to network/mhfpacket/msg_sys_reserve1a9.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve1aa.go b/network/mhfpacket/msg_sys_reserve1aa.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve1aa.go rename to network/mhfpacket/msg_sys_reserve1aa.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve1ab.go b/network/mhfpacket/msg_sys_reserve1ab.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve1ab.go rename to network/mhfpacket/msg_sys_reserve1ab.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve1ac.go b/network/mhfpacket/msg_sys_reserve1ac.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve1ac.go rename to network/mhfpacket/msg_sys_reserve1ac.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve1ad.go b/network/mhfpacket/msg_sys_reserve1ad.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve1ad.go rename to network/mhfpacket/msg_sys_reserve1ad.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve1ae.go b/network/mhfpacket/msg_sys_reserve1ae.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve1ae.go rename to network/mhfpacket/msg_sys_reserve1ae.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve1af.go b/network/mhfpacket/msg_sys_reserve1af.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve1af.go rename to network/mhfpacket/msg_sys_reserve1af.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve4a.go b/network/mhfpacket/msg_sys_reserve4a.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve4a.go rename to network/mhfpacket/msg_sys_reserve4a.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve4b.go b/network/mhfpacket/msg_sys_reserve4b.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve4b.go rename to network/mhfpacket/msg_sys_reserve4b.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve4c.go b/network/mhfpacket/msg_sys_reserve4c.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve4c.go rename to network/mhfpacket/msg_sys_reserve4c.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve4d.go b/network/mhfpacket/msg_sys_reserve4d.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve4d.go rename to network/mhfpacket/msg_sys_reserve4d.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve4e.go b/network/mhfpacket/msg_sys_reserve4e.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve4e.go rename to network/mhfpacket/msg_sys_reserve4e.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve4f.go b/network/mhfpacket/msg_sys_reserve4f.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve4f.go rename to network/mhfpacket/msg_sys_reserve4f.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve55.go b/network/mhfpacket/msg_sys_reserve55.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve55.go rename to network/mhfpacket/msg_sys_reserve55.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve56.go b/network/mhfpacket/msg_sys_reserve56.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve56.go rename to network/mhfpacket/msg_sys_reserve56.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve57.go b/network/mhfpacket/msg_sys_reserve57.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve57.go rename to network/mhfpacket/msg_sys_reserve57.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve5c.go b/network/mhfpacket/msg_sys_reserve5c.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve5c.go rename to network/mhfpacket/msg_sys_reserve5c.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve5e.go b/network/mhfpacket/msg_sys_reserve5e.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve5e.go rename to network/mhfpacket/msg_sys_reserve5e.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve5f.go b/network/mhfpacket/msg_sys_reserve5f.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve5f.go rename to network/mhfpacket/msg_sys_reserve5f.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve71.go b/network/mhfpacket/msg_sys_reserve71.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve71.go rename to network/mhfpacket/msg_sys_reserve71.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve72.go b/network/mhfpacket/msg_sys_reserve72.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve72.go rename to network/mhfpacket/msg_sys_reserve72.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve73.go b/network/mhfpacket/msg_sys_reserve73.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve73.go rename to network/mhfpacket/msg_sys_reserve73.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve74.go b/network/mhfpacket/msg_sys_reserve74.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve74.go rename to network/mhfpacket/msg_sys_reserve74.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve75.go b/network/mhfpacket/msg_sys_reserve75.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve75.go rename to network/mhfpacket/msg_sys_reserve75.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve76.go b/network/mhfpacket/msg_sys_reserve76.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve76.go rename to network/mhfpacket/msg_sys_reserve76.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve77.go b/network/mhfpacket/msg_sys_reserve77.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve77.go rename to network/mhfpacket/msg_sys_reserve77.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve78.go b/network/mhfpacket/msg_sys_reserve78.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve78.go rename to network/mhfpacket/msg_sys_reserve78.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve79.go b/network/mhfpacket/msg_sys_reserve79.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve79.go rename to network/mhfpacket/msg_sys_reserve79.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve7a.go b/network/mhfpacket/msg_sys_reserve7a.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve7a.go rename to network/mhfpacket/msg_sys_reserve7a.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve7b.go b/network/mhfpacket/msg_sys_reserve7b.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve7b.go rename to network/mhfpacket/msg_sys_reserve7b.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve7c.go b/network/mhfpacket/msg_sys_reserve7c.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve7c.go rename to network/mhfpacket/msg_sys_reserve7c.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve7e.go b/network/mhfpacket/msg_sys_reserve7e.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve7e.go rename to network/mhfpacket/msg_sys_reserve7e.go diff --git a/Erupe/network/mhfpacket/msg_sys_reserve_stage.go b/network/mhfpacket/msg_sys_reserve_stage.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_reserve_stage.go rename to network/mhfpacket/msg_sys_reserve_stage.go diff --git a/Erupe/network/mhfpacket/msg_sys_rights_reload.go b/network/mhfpacket/msg_sys_rights_reload.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_rights_reload.go rename to network/mhfpacket/msg_sys_rights_reload.go diff --git a/Erupe/network/mhfpacket/msg_sys_rotate_object.go b/network/mhfpacket/msg_sys_rotate_object.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_rotate_object.go rename to network/mhfpacket/msg_sys_rotate_object.go diff --git a/Erupe/network/mhfpacket/msg_sys_serialize.go b/network/mhfpacket/msg_sys_serialize.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_serialize.go rename to network/mhfpacket/msg_sys_serialize.go diff --git a/Erupe/network/mhfpacket/msg_sys_set_object_binary.go b/network/mhfpacket/msg_sys_set_object_binary.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_set_object_binary.go rename to network/mhfpacket/msg_sys_set_object_binary.go diff --git a/Erupe/network/mhfpacket/msg_sys_set_stage_binary.go b/network/mhfpacket/msg_sys_set_stage_binary.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_set_stage_binary.go rename to network/mhfpacket/msg_sys_set_stage_binary.go diff --git a/Erupe/network/mhfpacket/msg_sys_set_stage_pass.go b/network/mhfpacket/msg_sys_set_stage_pass.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_set_stage_pass.go rename to network/mhfpacket/msg_sys_set_stage_pass.go diff --git a/Erupe/network/mhfpacket/msg_sys_set_status.go b/network/mhfpacket/msg_sys_set_status.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_set_status.go rename to network/mhfpacket/msg_sys_set_status.go diff --git a/Erupe/network/mhfpacket/msg_sys_set_user_binary.go b/network/mhfpacket/msg_sys_set_user_binary.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_set_user_binary.go rename to network/mhfpacket/msg_sys_set_user_binary.go diff --git a/Erupe/network/mhfpacket/msg_sys_stage_destruct.go b/network/mhfpacket/msg_sys_stage_destruct.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_stage_destruct.go rename to network/mhfpacket/msg_sys_stage_destruct.go diff --git a/Erupe/network/mhfpacket/msg_sys_terminal_log.go b/network/mhfpacket/msg_sys_terminal_log.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_terminal_log.go rename to network/mhfpacket/msg_sys_terminal_log.go diff --git a/Erupe/network/mhfpacket/msg_sys_time.go b/network/mhfpacket/msg_sys_time.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_time.go rename to network/mhfpacket/msg_sys_time.go diff --git a/Erupe/network/mhfpacket/msg_sys_trans_binary.go b/network/mhfpacket/msg_sys_trans_binary.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_trans_binary.go rename to network/mhfpacket/msg_sys_trans_binary.go diff --git a/Erupe/network/mhfpacket/msg_sys_unlock_global_sema.go b/network/mhfpacket/msg_sys_unlock_global_sema.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_unlock_global_sema.go rename to network/mhfpacket/msg_sys_unlock_global_sema.go diff --git a/Erupe/network/mhfpacket/msg_sys_unlock_stage.go b/network/mhfpacket/msg_sys_unlock_stage.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_unlock_stage.go rename to network/mhfpacket/msg_sys_unlock_stage.go diff --git a/Erupe/network/mhfpacket/msg_sys_unreserve_stage.go b/network/mhfpacket/msg_sys_unreserve_stage.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_unreserve_stage.go rename to network/mhfpacket/msg_sys_unreserve_stage.go diff --git a/Erupe/network/mhfpacket/msg_sys_update_object_binary.go b/network/mhfpacket/msg_sys_update_object_binary.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_update_object_binary.go rename to network/mhfpacket/msg_sys_update_object_binary.go diff --git a/Erupe/network/mhfpacket/msg_sys_update_right.go b/network/mhfpacket/msg_sys_update_right.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_update_right.go rename to network/mhfpacket/msg_sys_update_right.go diff --git a/Erupe/network/mhfpacket/msg_sys_wait_stage_binary.go b/network/mhfpacket/msg_sys_wait_stage_binary.go similarity index 100% rename from Erupe/network/mhfpacket/msg_sys_wait_stage_binary.go rename to network/mhfpacket/msg_sys_wait_stage_binary.go diff --git a/Erupe/network/mhfpacket/opcode_to_packet.go b/network/mhfpacket/opcode_to_packet.go similarity index 100% rename from Erupe/network/mhfpacket/opcode_to_packet.go rename to network/mhfpacket/opcode_to_packet.go diff --git a/Erupe/network/packetid.go b/network/packetid.go similarity index 100% rename from Erupe/network/packetid.go rename to network/packetid.go diff --git a/Erupe/network/packetid_string.go b/network/packetid_string.go similarity index 100% rename from Erupe/network/packetid_string.go rename to network/packetid_string.go diff --git a/Erupe/patch-schema/aio-upgrade.sql b/patch-schema/aio-upgrade.sql similarity index 100% rename from Erupe/patch-schema/aio-upgrade.sql rename to patch-schema/aio-upgrade.sql diff --git a/Erupe/patch-schema/airouv2.sql b/patch-schema/airouv2.sql similarity index 100% rename from Erupe/patch-schema/airouv2.sql rename to patch-schema/airouv2.sql diff --git a/Erupe/patch-schema/distitem.sql b/patch-schema/distitem.sql similarity index 100% rename from Erupe/patch-schema/distitem.sql rename to patch-schema/distitem.sql diff --git a/Erupe/patch-schema/gook.sql b/patch-schema/gook.sql similarity index 100% rename from Erupe/patch-schema/gook.sql rename to patch-schema/gook.sql diff --git a/Erupe/patch-schema/guild-additions.sql b/patch-schema/guild-additions.sql similarity index 100% rename from Erupe/patch-schema/guild-additions.sql rename to patch-schema/guild-additions.sql diff --git a/Erupe/patch-schema/houseinterior.sql b/patch-schema/houseinterior.sql similarity index 100% rename from Erupe/patch-schema/houseinterior.sql rename to patch-schema/houseinterior.sql diff --git a/Erupe/patch-schema/road-shop-rotation.sql b/patch-schema/road-shop-rotation.sql similarity index 100% rename from Erupe/patch-schema/road-shop-rotation.sql rename to patch-schema/road-shop-rotation.sql diff --git a/Erupe/patch-schema/scenariocounter.sql b/patch-schema/scenariocounter.sql similarity index 100% rename from Erupe/patch-schema/scenariocounter.sql rename to patch-schema/scenariocounter.sql diff --git a/Erupe/patch-schema/tokensessions.sql b/patch-schema/tokensessions.sql similarity index 100% rename from Erupe/patch-schema/tokensessions.sql rename to patch-schema/tokensessions.sql diff --git a/Erupe/savedata/.gitkeep b/savedata/.gitkeep similarity index 100% rename from Erupe/savedata/.gitkeep rename to savedata/.gitkeep diff --git a/Erupe/server/channelserver/compression/deltacomp/deltacomp.go b/server/channelserver/compression/deltacomp/deltacomp.go similarity index 93% rename from Erupe/server/channelserver/compression/deltacomp/deltacomp.go rename to server/channelserver/compression/deltacomp/deltacomp.go index 9760e86a0..0d5aa55be 100644 --- a/Erupe/server/channelserver/compression/deltacomp/deltacomp.go +++ b/server/channelserver/compression/deltacomp/deltacomp.go @@ -2,8 +2,8 @@ package deltacomp import ( "bytes" - "io" "fmt" + "io" ) func checkReadUint8(r *bytes.Reader) (uint8, error) { @@ -76,9 +76,9 @@ func ApplyDataDiff(diff []byte, baseData []byte) []byte { differentCount-- // Grow slice if it's required - if(len(baseCopy) < dataOffset){ + if len(baseCopy) < dataOffset { fmt.Printf("Slice smaller than data offset, growing slice...") - baseCopy = append(baseCopy, make([]byte, (dataOffset + differentCount) - len(baseData))...) + baseCopy = append(baseCopy, make([]byte, (dataOffset+differentCount)-len(baseData))...) } else { length := len(baseCopy[dataOffset:]) if length < differentCount { @@ -87,7 +87,6 @@ func ApplyDataDiff(diff []byte, baseData []byte) []byte { } } - // Apply the patch bytes. for i := 0; i < differentCount; i++ { b, err := checkReadUint8(patch) @@ -95,7 +94,6 @@ func ApplyDataDiff(diff []byte, baseData []byte) []byte { panic("Invalid or misunderstood patch format!") } - baseCopy[dataOffset+i] = b } diff --git a/Erupe/server/channelserver/compression/deltacomp/deltacomp_test.go b/server/channelserver/compression/deltacomp/deltacomp_test.go similarity index 100% rename from Erupe/server/channelserver/compression/deltacomp/deltacomp_test.go rename to server/channelserver/compression/deltacomp/deltacomp_test.go diff --git a/Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_0_after.bin b/server/channelserver/compression/deltacomp/test_data/hunternavi_0_after.bin similarity index 100% rename from Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_0_after.bin rename to server/channelserver/compression/deltacomp/test_data/hunternavi_0_after.bin diff --git a/Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_0_before.bin b/server/channelserver/compression/deltacomp/test_data/hunternavi_0_before.bin similarity index 100% rename from Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_0_before.bin rename to server/channelserver/compression/deltacomp/test_data/hunternavi_0_before.bin diff --git a/Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_0_patch_0.bin b/server/channelserver/compression/deltacomp/test_data/hunternavi_0_patch_0.bin similarity index 100% rename from Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_0_patch_0.bin rename to server/channelserver/compression/deltacomp/test_data/hunternavi_0_patch_0.bin diff --git a/Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_0_patch_1.bin b/server/channelserver/compression/deltacomp/test_data/hunternavi_0_patch_1.bin similarity index 100% rename from Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_0_patch_1.bin rename to server/channelserver/compression/deltacomp/test_data/hunternavi_0_patch_1.bin diff --git a/Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_after.bin b/server/channelserver/compression/deltacomp/test_data/hunternavi_1_after.bin similarity index 100% rename from Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_after.bin rename to server/channelserver/compression/deltacomp/test_data/hunternavi_1_after.bin diff --git a/Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_before.bin b/server/channelserver/compression/deltacomp/test_data/hunternavi_1_before.bin similarity index 100% rename from Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_before.bin rename to server/channelserver/compression/deltacomp/test_data/hunternavi_1_before.bin diff --git a/Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_0.bin b/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_0.bin similarity index 100% rename from Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_0.bin rename to server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_0.bin diff --git a/Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_1.bin b/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_1.bin similarity index 100% rename from Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_1.bin rename to server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_1.bin diff --git a/Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_10.bin b/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_10.bin similarity index 100% rename from Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_10.bin rename to server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_10.bin diff --git a/Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_11.bin b/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_11.bin similarity index 100% rename from Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_11.bin rename to server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_11.bin diff --git a/Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_12.bin b/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_12.bin similarity index 100% rename from Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_12.bin rename to server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_12.bin diff --git a/Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_13.bin b/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_13.bin similarity index 100% rename from Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_13.bin rename to server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_13.bin diff --git a/Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_14.bin b/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_14.bin similarity index 100% rename from Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_14.bin rename to server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_14.bin diff --git a/Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_15.bin b/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_15.bin similarity index 100% rename from Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_15.bin rename to server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_15.bin diff --git a/Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_16.bin b/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_16.bin similarity index 100% rename from Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_16.bin rename to server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_16.bin diff --git a/Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_17.bin b/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_17.bin similarity index 100% rename from Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_17.bin rename to server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_17.bin diff --git a/Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_18.bin b/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_18.bin similarity index 100% rename from Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_18.bin rename to server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_18.bin diff --git a/Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_19.bin b/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_19.bin similarity index 100% rename from Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_19.bin rename to server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_19.bin diff --git a/Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_2.bin b/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_2.bin similarity index 100% rename from Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_2.bin rename to server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_2.bin diff --git a/Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_20.bin b/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_20.bin similarity index 100% rename from Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_20.bin rename to server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_20.bin diff --git a/Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_21.bin b/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_21.bin similarity index 100% rename from Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_21.bin rename to server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_21.bin diff --git a/Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_22.bin b/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_22.bin similarity index 100% rename from Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_22.bin rename to server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_22.bin diff --git a/Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_23.bin b/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_23.bin similarity index 100% rename from Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_23.bin rename to server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_23.bin diff --git a/Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_24.bin b/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_24.bin similarity index 100% rename from Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_24.bin rename to server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_24.bin diff --git a/Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_3.bin b/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_3.bin similarity index 100% rename from Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_3.bin rename to server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_3.bin diff --git a/Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_4.bin b/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_4.bin similarity index 100% rename from Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_4.bin rename to server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_4.bin diff --git a/Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_5.bin b/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_5.bin similarity index 100% rename from Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_5.bin rename to server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_5.bin diff --git a/Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_6.bin b/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_6.bin similarity index 100% rename from Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_6.bin rename to server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_6.bin diff --git a/Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_7.bin b/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_7.bin similarity index 100% rename from Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_7.bin rename to server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_7.bin diff --git a/Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_8.bin b/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_8.bin similarity index 100% rename from Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_8.bin rename to server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_8.bin diff --git a/Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_9.bin b/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_9.bin similarity index 100% rename from Erupe/server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_9.bin rename to server/channelserver/compression/deltacomp/test_data/hunternavi_1_patch_9.bin diff --git a/Erupe/server/channelserver/compression/deltacomp/test_data/platedata_0_after.bin b/server/channelserver/compression/deltacomp/test_data/platedata_0_after.bin similarity index 100% rename from Erupe/server/channelserver/compression/deltacomp/test_data/platedata_0_after.bin rename to server/channelserver/compression/deltacomp/test_data/platedata_0_after.bin diff --git a/Erupe/server/channelserver/compression/deltacomp/test_data/platedata_0_before.bin b/server/channelserver/compression/deltacomp/test_data/platedata_0_before.bin similarity index 100% rename from Erupe/server/channelserver/compression/deltacomp/test_data/platedata_0_before.bin rename to server/channelserver/compression/deltacomp/test_data/platedata_0_before.bin diff --git a/Erupe/server/channelserver/compression/deltacomp/test_data/platedata_0_patch_0.bin b/server/channelserver/compression/deltacomp/test_data/platedata_0_patch_0.bin similarity index 100% rename from Erupe/server/channelserver/compression/deltacomp/test_data/platedata_0_patch_0.bin rename to server/channelserver/compression/deltacomp/test_data/platedata_0_patch_0.bin diff --git a/Erupe/server/channelserver/compression/deltacomp/test_data/platedata_0_patch_1.bin b/server/channelserver/compression/deltacomp/test_data/platedata_0_patch_1.bin similarity index 100% rename from Erupe/server/channelserver/compression/deltacomp/test_data/platedata_0_patch_1.bin rename to server/channelserver/compression/deltacomp/test_data/platedata_0_patch_1.bin diff --git a/Erupe/server/channelserver/compression/nullcomp/nullcomp.go b/server/channelserver/compression/nullcomp/nullcomp.go similarity index 99% rename from Erupe/server/channelserver/compression/nullcomp/nullcomp.go rename to server/channelserver/compression/nullcomp/nullcomp.go index 402778e5d..e8b9c952e 100644 --- a/Erupe/server/channelserver/compression/nullcomp/nullcomp.go +++ b/server/channelserver/compression/nullcomp/nullcomp.go @@ -95,4 +95,4 @@ func Compress(rawData []byte) ([]byte, error) { } } return output, nil -} \ No newline at end of file +} diff --git a/Erupe/server/channelserver/handlers.go b/server/channelserver/handlers.go similarity index 71% rename from Erupe/server/channelserver/handlers.go rename to server/channelserver/handlers.go index fcb17cb55..8552828cd 100644 --- a/Erupe/server/channelserver/handlers.go +++ b/server/channelserver/handlers.go @@ -224,18 +224,18 @@ func logoutPlayer(s *Session) { } if s.stage == nil { - return + return } - s.server.BroadcastMHF(&mhfpacket.MsgSysDeleteUser { + s.server.BroadcastMHF(&mhfpacket.MsgSysDeleteUser{ CharID: s.charID, }, s) s.server.Lock() - for _, stage := range s.server.stages { - if _, exists := stage.reservedClientSlots[s.charID]; exists { - delete(stage.reservedClientSlots, s.charID) - } + for _, stage := range s.server.stages { + if _, exists := stage.reservedClientSlots[s.charID]; exists { + delete(stage.reservedClientSlots, s.charID) + } } s.server.Unlock() @@ -637,712 +637,712 @@ func handleMsgMhfInfoScenarioCounter(s *Session, p mhfpacket.MHFPacket) { pkt := p.(*mhfpacket.MsgMhfInfoScenarioCounter) scenarioCounter := []struct { MainID uint32 - Unk1 uint8 // Bool item exchange? + Unk1 uint8 // Bool item exchange? // 0 = basic, 1 = veteran, 3 = other, 6 = pallone, 7 = diva CategoryID uint8 }{ - //000000110000 - { - MainID: 0x00000011, Unk1: 0, CategoryID: 0, - }, - // 0000005D0001 - { - MainID: 0x0000005D, Unk1: 0, CategoryID: 1, - }, - // 0000005C0001 - { - MainID: 0x0000005C, Unk1: 0, CategoryID: 1, - }, - // 000000510001 - { - MainID: 0x00000051, Unk1: 0, CategoryID: 1, - }, - // 0000005B0001 - { - MainID: 0x0000005B, Unk1: 0, CategoryID: 1, - }, - // 0000005A0001 - { - MainID: 0x0000005A, Unk1: 0, CategoryID: 1, - }, - // 000000590001 - { - MainID: 0x00000059, Unk1: 0, CategoryID: 1, - }, - // 000000580001 - { - MainID: 0x00000058, Unk1: 0, CategoryID: 1, - }, - // 000000570001 - { - MainID: 0x00000057, Unk1: 0, CategoryID: 1, - }, - // 000000560001 - { - MainID: 0x00000056, Unk1: 0, CategoryID: 1, - }, - // 000000550001 - { - MainID: 0x00000055, Unk1: 0, CategoryID: 1, - }, - // 000000540001 - { - MainID: 0x00000054, Unk1: 0, CategoryID: 1, - }, - // 000000530001 - { - MainID: 0x00000053, Unk1: 0, CategoryID: 1, - }, - // 000000520001 - { - MainID: 0x00000052, Unk1: 0, CategoryID: 1, - }, - // 000000570103 - { - MainID: 0x00000057, Unk1: 1, CategoryID: 3, - }, - // 000000580103 - { - MainID: 0x00000058, Unk1: 1, CategoryID: 3, - }, - // 000000590103 - { - MainID: 0x00000059, Unk1: 1, CategoryID: 3, - }, - // 0000005A0103 - { - MainID: 0x0000005A, Unk1: 1, CategoryID: 3, - }, - // 0000005B0103 - { - MainID: 0x0000005B, Unk1: 1, CategoryID: 3, - }, - // 0000005C0103 - { - MainID: 0x0000005C, Unk1: 1, CategoryID: 3, - }, - // 000000530103 - { - MainID: 0x00000053, Unk1: 1, CategoryID: 3, - }, - // 000000560103 - { - MainID: 0x00000056, Unk1: 1, CategoryID: 3, - }, - // 0000003C0103 - { - MainID: 0x0000003C, Unk1: 1, CategoryID: 3, - }, - // 0000003A0103 - { - MainID: 0x0000003A, Unk1: 1, CategoryID: 3, - }, - // 0000003B0103 - { - MainID: 0x0000003B, Unk1: 1, CategoryID: 3, - }, - // 0000001B0103 - { - MainID: 0x0000001B, Unk1: 1, CategoryID: 3, - }, - // 000000190103 - { - MainID: 0x00000019, Unk1: 1, CategoryID: 3, - }, - // 0000001A0103 - { - MainID: 0x0000001A, Unk1: 1, CategoryID: 3, - }, - // 000000170103 - { - MainID: 0x00000017, Unk1: 1, CategoryID: 3, - }, - // 000000020103 - { - MainID: 0x00000002, Unk1: 1, CategoryID: 3, - }, - // 000000030103 - { - MainID: 0x00000003, Unk1: 1, CategoryID: 3, - }, - // 000000040103 - { - MainID: 0x00000004, Unk1: 1, CategoryID: 3, - }, - // 0000001F0103 - { - MainID: 0x0000001F, Unk1: 1, CategoryID: 3, - }, - // 000000200103 - { - MainID: 0x00000020, Unk1: 1, CategoryID: 3, - }, - // 000000210103 - { - MainID: 0x00000021, Unk1: 1, CategoryID: 3, - }, - // 000000220103 - { - MainID: 0x00000022, Unk1: 1, CategoryID: 3, - }, - // 000000230103 - { - MainID: 0x00000023, Unk1: 1, CategoryID: 3, - }, - // 000000240103 - { - MainID: 0x00000024, Unk1: 1, CategoryID: 3, - }, - // 000000250103 - { - MainID: 0x00000025, Unk1: 1, CategoryID: 3, - }, - // 000000280103 - { - MainID: 0x00000028, Unk1: 1, CategoryID: 3, - }, - // 000000260103 - { - MainID: 0x00000026, Unk1: 1, CategoryID: 3, - }, - // 000000270103 - { - MainID: 0x00000027, Unk1: 1, CategoryID: 3, - }, - // 000000300103 - { - MainID: 0x00000030, Unk1: 1, CategoryID: 3, - }, - // 0000000C0103 - { - MainID: 0x0000000C, Unk1: 1, CategoryID: 3, - }, - // 0000000D0103 - { - MainID: 0x0000000D, Unk1: 1, CategoryID: 3, - }, - // 0000001E0103 - { - MainID: 0x0000001E, Unk1: 1, CategoryID: 3, - }, - // 0000001D0103 - { - MainID: 0x0000001D, Unk1: 1, CategoryID: 3, - }, - // 0000002E0003 - { - MainID: 0x0000002E, Unk1: 0, CategoryID: 3, - }, - // 000000000004 - { - MainID: 0x00000000, Unk1: 0, CategoryID: 4, - }, - // 000000010004 - { - MainID: 0x00000001, Unk1: 0, CategoryID: 4, - }, - // 000000020004 - { - MainID: 0x00000002, Unk1: 0, CategoryID: 4, - }, - // 000000030004 - { - MainID: 0x00000003, Unk1: 0, CategoryID: 4, - }, - // 000000040004 - { - MainID: 0x00000004, Unk1: 0, CategoryID: 4, - }, - // 000000050004 - { - MainID: 0x00000005, Unk1: 0, CategoryID: 4, - }, - // 000000060004 - { - MainID: 0x00000006, Unk1: 0, CategoryID: 4, - }, - // 000000070004 - { - MainID: 0x00000007, Unk1: 0, CategoryID: 4, - }, - // 000000080004 - { - MainID: 0x00000008, Unk1: 0, CategoryID: 4, - }, - // 000000090004 - { - MainID: 0x00000009, Unk1: 0, CategoryID: 4, - }, - // 0000000A0004 - { - MainID: 0x0000000A, Unk1: 0, CategoryID: 4, - }, - // 0000000B0004 - { - MainID: 0x0000000B, Unk1: 0, CategoryID: 4, - }, - // 0000000C0004 - { - MainID: 0x0000000C, Unk1: 0, CategoryID: 4, - }, - // 0000000D0004 - { - MainID: 0x0000000D, Unk1: 0, CategoryID: 4, - }, - // 0000000E0004 - { - MainID: 0x0000000E, Unk1: 0, CategoryID: 4, - }, - // 000000320005 - { - MainID: 0x00000032, Unk1: 0, CategoryID: 5, - }, - // 000000330005 - { - MainID: 0x00000033, Unk1: 0, CategoryID: 5, - }, - // 000000340005 - { - MainID: 0x00000034, Unk1: 0, CategoryID: 5, - }, - // 000000350005 - { - MainID: 0x00000035, Unk1: 0, CategoryID: 5, - }, - // 000000360005 - { - MainID: 0x00000036, Unk1: 0, CategoryID: 5, - }, - // 000000370005 - { - MainID: 0x00000037, Unk1: 0, CategoryID: 5, - }, - // 000000380005 - { - MainID: 0x00000038, Unk1: 0, CategoryID: 5, - }, - // 0000003A0005 - { - MainID: 0x0000003A, Unk1: 0, CategoryID: 5, - }, - // 0000003F0005 - { - MainID: 0x0000003F, Unk1: 0, CategoryID: 5, - }, - // 000000400005 - { - MainID: 0x00000040, Unk1: 0, CategoryID: 5, - }, - // 000000410005 - { - MainID: 0x00000041, Unk1: 0, CategoryID: 5, - }, - // 000000430005 - { - MainID: 0x00000043, Unk1: 0, CategoryID: 5, - }, - // 000000470005 - { - MainID: 0x00000047, Unk1: 0, CategoryID: 5, - }, - // 0000004B0005 - { - MainID: 0x0000004B, Unk1: 0, CategoryID: 5, - }, - // 0000003D0005 - { - MainID: 0x0000003D, Unk1: 0, CategoryID: 5, - }, - // 000000440005 - { - MainID: 0x00000044, Unk1: 0, CategoryID: 5, - }, - // 000000420005 - { - MainID: 0x00000042, Unk1: 0, CategoryID: 5, - }, - // 0000004C0005 - { - MainID: 0x0000004C, Unk1: 0, CategoryID: 5, - }, - // 000000460005 - { - MainID: 0x00000046, Unk1: 0, CategoryID: 5, - }, - // 0000004D0005 - { - MainID: 0x0000004D, Unk1: 0, CategoryID: 5, - }, - // 000000480005 - { - MainID: 0x00000048, Unk1: 0, CategoryID: 5, - }, - // 0000004A0005 - { - MainID: 0x0000004A, Unk1: 0, CategoryID: 5, - }, - // 000000490005 - { - MainID: 0x00000049, Unk1: 0, CategoryID: 5, - }, - // 0000004E0005 - { - MainID: 0x0000004E, Unk1: 0, CategoryID: 5, - }, - // 000000450005 - { - MainID: 0x00000045, Unk1: 0, CategoryID: 5, - }, - // 0000003E0005 - { - MainID: 0x0000003E, Unk1: 0, CategoryID: 5, - }, - // 0000004F0005 - { - MainID: 0x0000004F, Unk1: 0, CategoryID: 5, - }, - // 000000000106 - { - MainID: 0x00000000, Unk1: 1, CategoryID: 6, - }, - // 000000010106 - { - MainID: 0x00000001, Unk1: 1, CategoryID: 6, - }, - // 000000020106 - { - MainID: 0x00000002, Unk1: 1, CategoryID: 6, - }, - // 000000030106 - { - MainID: 0x00000003, Unk1: 1, CategoryID: 6, - }, - // 000000040106 - { - MainID: 0x00000004, Unk1: 1, CategoryID: 6, - }, - // 000000050106 - { - MainID: 0x00000005, Unk1: 1, CategoryID: 6, - }, - // 000000060106 - { - MainID: 0x00000006, Unk1: 1, CategoryID: 6, - }, - // 000000070106 - { - MainID: 0x00000007, Unk1: 1, CategoryID: 6, - }, - // 000000080106 - { - MainID: 0x00000008, Unk1: 1, CategoryID: 6, - }, - // 000000090106 - { - MainID: 0x00000009, Unk1: 1, CategoryID: 6, - }, - // 000000110106 - { - MainID: 0x00000011, Unk1: 1, CategoryID: 6, - }, - // 0000000A0106 - { - MainID: 0x0000000A, Unk1: 1, CategoryID: 6, - }, - // 0000000B0106 - { - MainID: 0x0000000B, Unk1: 1, CategoryID: 6, - }, - // 0000000C0106 - { - MainID: 0x0000000C, Unk1: 1, CategoryID: 6, - }, - // 0000000D0106 - { - MainID: 0x0000000D, Unk1: 1, CategoryID: 6, - }, - // 0000000E0106 - { - MainID: 0x0000000E, Unk1: 1, CategoryID: 6, - }, - // 0000000F0106 - { - MainID: 0x0000000F, Unk1: 1, CategoryID: 6, - }, - // 000000100106 - { - MainID: 0x00000010, Unk1: 1, CategoryID: 6, - }, - // 000000320107 - { - MainID: 0x00000032, Unk1: 1, CategoryID: 7, - }, - // 000000350107 - { - MainID: 0x00000035, Unk1: 1, CategoryID: 7, - }, - // 0000003E0107 - { - MainID: 0x0000003E, Unk1: 1, CategoryID: 7, - }, - // 000000340107 - { - MainID: 0x00000034, Unk1: 1, CategoryID: 7, - }, - // 000000380107 - { - MainID: 0x00000038, Unk1: 1, CategoryID: 7, - }, - // 000000330107 - { - MainID: 0x00000033, Unk1: 1, CategoryID: 7, - }, - // 000000310107 - { - MainID: 0x00000031, Unk1: 1, CategoryID: 7, - }, - // 000000360107 - { - MainID: 0x00000036, Unk1: 1, CategoryID: 7, - }, - // 000000390107 - { - MainID: 0x00000039, Unk1: 1, CategoryID: 7, - }, - // 000000370107 - { - MainID: 0x00000037, Unk1: 1, CategoryID: 7, - }, - // 0000003D0107 - { - MainID: 0x0000003D, Unk1: 1, CategoryID: 7, - }, - // 0000003A0107 - { - MainID: 0x0000003A, Unk1: 1, CategoryID: 7, - }, - // 0000003C0107 - { - MainID: 0x0000003C, Unk1: 1, CategoryID: 7, - }, - // 0000003B0107 - { - MainID: 0x0000003B, Unk1: 1, CategoryID: 7, - }, - // 0000002A0107 - { - MainID: 0x0000002A, Unk1: 1, CategoryID: 7, - }, - // 000000300107 - { - MainID: 0x00000030, Unk1: 1, CategoryID: 7, - }, - // 000000280107 - { - MainID: 0x00000028, Unk1: 1, CategoryID: 7, - }, - // 000000270107 - { - MainID: 0x00000027, Unk1: 1, CategoryID: 7, - }, - // 0000002B0107 - { - MainID: 0x0000002B, Unk1: 1, CategoryID: 7, - }, - // 0000002E0107 - { - MainID: 0x0000002E, Unk1: 1, CategoryID: 7, - }, - // 000000290107 - { - MainID: 0x00000029, Unk1: 1, CategoryID: 7, - }, - // 0000002C0107 - { - MainID: 0x0000002C, Unk1: 1, CategoryID: 7, - }, - // 0000002D0107 - { - MainID: 0x0000002D, Unk1: 1, CategoryID: 7, - }, - // 0000002F0107 - { - MainID: 0x0000002F, Unk1: 1, CategoryID: 7, - }, - // 000000250107 - { - MainID: 0x00000025, Unk1: 1, CategoryID: 7, - }, - // 000000220107 - { - MainID: 0x00000022, Unk1: 1, CategoryID: 7, - }, - // 000000210107 - { - MainID: 0x00000021, Unk1: 1, CategoryID: 7, - }, - // 000000200107 - { - MainID: 0x00000020, Unk1: 1, CategoryID: 7, - }, - // 0000001C0107 - { - MainID: 0x0000001C, Unk1: 1, CategoryID: 7, - }, - // 0000001A0107 - { - MainID: 0x0000001A, Unk1: 1, CategoryID: 7, - }, - // 000000240107 - { - MainID: 0x00000024, Unk1: 1, CategoryID: 7, - }, - // 000000260107 - { - MainID: 0x00000026, Unk1: 1, CategoryID: 7, - }, - // 000000230107 - { - MainID: 0x00000023, Unk1: 1, CategoryID: 7, - }, - // 0000001B0107 - { - MainID: 0x0000001B, Unk1: 1, CategoryID: 7, - }, - // 0000001E0107 - { - MainID: 0x0000001E, Unk1: 1, CategoryID: 7, - }, - // 0000001F0107 - { - MainID: 0x0000001F, Unk1: 1, CategoryID: 7, - }, - // 0000001D0107 - { - MainID: 0x0000001D, Unk1: 1, CategoryID: 7, - }, - // 000000180107 - { - MainID: 0x00000018, Unk1: 1, CategoryID: 7, - }, - // 000000170107 - { - MainID: 0x00000017, Unk1: 1, CategoryID: 7, - }, - // 000000160107 - { - MainID: 0x00000016, Unk1: 1, CategoryID: 7, - }, - // 000000150107 - // Missing file - // { - // MainID: 0x00000015, Unk1: 1, CategoryID: 7, - // }, - // 000000190107 - { - MainID: 0x00000019, Unk1: 1, CategoryID: 7, - }, - // 000000140107 - // Missing file - // { - // MainID: 0x00000014, Unk1: 1, CategoryID: 7, - // }, - // 000000070107 - // Missing file - // { - // MainID: 0x00000007, Unk1: 1, CategoryID: 7, - // }, - // 000000090107 - // Missing file - // { - // MainID: 0x00000009, Unk1: 1, CategoryID: 7, - // }, - // 0000000D0107 - // Missing file - // { - // MainID: 0x0000000D, Unk1: 1, CategoryID: 7, - // }, - // 000000100107 - // Missing file - // { - // MainID: 0x00000010, Unk1: 1, CategoryID: 7, - // }, - // 0000000C0107 - // Missing file - // { - // MainID: 0x0000000C, Unk1: 1, CategoryID: 7, - // }, - // 0000000E0107 - // Missing file - // { - // MainID: 0x0000000E, Unk1: 1, CategoryID: 7, - // }, - // 0000000F0107 - // Missing file - // { - // MainID: 0x0000000F, Unk1: 1, CategoryID: 7, - // }, - // 000000130107 - // Missing file - // { - // MainID: 0x00000013, Unk1: 1, CategoryID: 7, - // }, - // 0000000A0107 - // Missing file - // { - // MainID: 0x0000000A, Unk1: 1, CategoryID: 7, - // }, - // 000000080107 - // Missing file - // { - // MainID: 0x00000008, Unk1: 1, CategoryID: 7, - // }, - // 0000000B0107 - // Missing file - // { - // MainID: 0x0000000B, Unk1: 1, CategoryID: 7, - // }, - // 000000120107 - // Missing file - // { - // MainID: 0x00000012, Unk1: 1, CategoryID: 7, - // }, - // 000000110107 - // Missing file - // { - // MainID: 0x00000011, Unk1: 1, CategoryID: 7, - // }, - // 000000060107 - // Missing file - // { - // MainID: 0x00000006, Unk1: 1, CategoryID: 7, - // }, - // 000000050107 - // Missing file - // { - // MainID: 0x00000005, Unk1: 1, CategoryID: 7, - // }, - // 000000040107 - // Missing file - // { - // MainID: 0x00000004, Unk1: 1, CategoryID: 7, - // }, - // 000000030107 - { - MainID: 0x00000003, Unk1: 1, CategoryID: 7, - }, - // 000000020107 - { - MainID: 0x00000002, Unk1: 1, CategoryID: 7, - }, - // 000000010107 - { - MainID: 0x00000001, Unk1: 1, CategoryID: 7, - }, - // 000000000107 - { - MainID: 0x00000000, Unk1: 1, CategoryID: 7, - }, + //000000110000 + { + MainID: 0x00000011, Unk1: 0, CategoryID: 0, + }, + // 0000005D0001 + { + MainID: 0x0000005D, Unk1: 0, CategoryID: 1, + }, + // 0000005C0001 + { + MainID: 0x0000005C, Unk1: 0, CategoryID: 1, + }, + // 000000510001 + { + MainID: 0x00000051, Unk1: 0, CategoryID: 1, + }, + // 0000005B0001 + { + MainID: 0x0000005B, Unk1: 0, CategoryID: 1, + }, + // 0000005A0001 + { + MainID: 0x0000005A, Unk1: 0, CategoryID: 1, + }, + // 000000590001 + { + MainID: 0x00000059, Unk1: 0, CategoryID: 1, + }, + // 000000580001 + { + MainID: 0x00000058, Unk1: 0, CategoryID: 1, + }, + // 000000570001 + { + MainID: 0x00000057, Unk1: 0, CategoryID: 1, + }, + // 000000560001 + { + MainID: 0x00000056, Unk1: 0, CategoryID: 1, + }, + // 000000550001 + { + MainID: 0x00000055, Unk1: 0, CategoryID: 1, + }, + // 000000540001 + { + MainID: 0x00000054, Unk1: 0, CategoryID: 1, + }, + // 000000530001 + { + MainID: 0x00000053, Unk1: 0, CategoryID: 1, + }, + // 000000520001 + { + MainID: 0x00000052, Unk1: 0, CategoryID: 1, + }, + // 000000570103 + { + MainID: 0x00000057, Unk1: 1, CategoryID: 3, + }, + // 000000580103 + { + MainID: 0x00000058, Unk1: 1, CategoryID: 3, + }, + // 000000590103 + { + MainID: 0x00000059, Unk1: 1, CategoryID: 3, + }, + // 0000005A0103 + { + MainID: 0x0000005A, Unk1: 1, CategoryID: 3, + }, + // 0000005B0103 + { + MainID: 0x0000005B, Unk1: 1, CategoryID: 3, + }, + // 0000005C0103 + { + MainID: 0x0000005C, Unk1: 1, CategoryID: 3, + }, + // 000000530103 + { + MainID: 0x00000053, Unk1: 1, CategoryID: 3, + }, + // 000000560103 + { + MainID: 0x00000056, Unk1: 1, CategoryID: 3, + }, + // 0000003C0103 + { + MainID: 0x0000003C, Unk1: 1, CategoryID: 3, + }, + // 0000003A0103 + { + MainID: 0x0000003A, Unk1: 1, CategoryID: 3, + }, + // 0000003B0103 + { + MainID: 0x0000003B, Unk1: 1, CategoryID: 3, + }, + // 0000001B0103 + { + MainID: 0x0000001B, Unk1: 1, CategoryID: 3, + }, + // 000000190103 + { + MainID: 0x00000019, Unk1: 1, CategoryID: 3, + }, + // 0000001A0103 + { + MainID: 0x0000001A, Unk1: 1, CategoryID: 3, + }, + // 000000170103 + { + MainID: 0x00000017, Unk1: 1, CategoryID: 3, + }, + // 000000020103 + { + MainID: 0x00000002, Unk1: 1, CategoryID: 3, + }, + // 000000030103 + { + MainID: 0x00000003, Unk1: 1, CategoryID: 3, + }, + // 000000040103 + { + MainID: 0x00000004, Unk1: 1, CategoryID: 3, + }, + // 0000001F0103 + { + MainID: 0x0000001F, Unk1: 1, CategoryID: 3, + }, + // 000000200103 + { + MainID: 0x00000020, Unk1: 1, CategoryID: 3, + }, + // 000000210103 + { + MainID: 0x00000021, Unk1: 1, CategoryID: 3, + }, + // 000000220103 + { + MainID: 0x00000022, Unk1: 1, CategoryID: 3, + }, + // 000000230103 + { + MainID: 0x00000023, Unk1: 1, CategoryID: 3, + }, + // 000000240103 + { + MainID: 0x00000024, Unk1: 1, CategoryID: 3, + }, + // 000000250103 + { + MainID: 0x00000025, Unk1: 1, CategoryID: 3, + }, + // 000000280103 + { + MainID: 0x00000028, Unk1: 1, CategoryID: 3, + }, + // 000000260103 + { + MainID: 0x00000026, Unk1: 1, CategoryID: 3, + }, + // 000000270103 + { + MainID: 0x00000027, Unk1: 1, CategoryID: 3, + }, + // 000000300103 + { + MainID: 0x00000030, Unk1: 1, CategoryID: 3, + }, + // 0000000C0103 + { + MainID: 0x0000000C, Unk1: 1, CategoryID: 3, + }, + // 0000000D0103 + { + MainID: 0x0000000D, Unk1: 1, CategoryID: 3, + }, + // 0000001E0103 + { + MainID: 0x0000001E, Unk1: 1, CategoryID: 3, + }, + // 0000001D0103 + { + MainID: 0x0000001D, Unk1: 1, CategoryID: 3, + }, + // 0000002E0003 + { + MainID: 0x0000002E, Unk1: 0, CategoryID: 3, + }, + // 000000000004 + { + MainID: 0x00000000, Unk1: 0, CategoryID: 4, + }, + // 000000010004 + { + MainID: 0x00000001, Unk1: 0, CategoryID: 4, + }, + // 000000020004 + { + MainID: 0x00000002, Unk1: 0, CategoryID: 4, + }, + // 000000030004 + { + MainID: 0x00000003, Unk1: 0, CategoryID: 4, + }, + // 000000040004 + { + MainID: 0x00000004, Unk1: 0, CategoryID: 4, + }, + // 000000050004 + { + MainID: 0x00000005, Unk1: 0, CategoryID: 4, + }, + // 000000060004 + { + MainID: 0x00000006, Unk1: 0, CategoryID: 4, + }, + // 000000070004 + { + MainID: 0x00000007, Unk1: 0, CategoryID: 4, + }, + // 000000080004 + { + MainID: 0x00000008, Unk1: 0, CategoryID: 4, + }, + // 000000090004 + { + MainID: 0x00000009, Unk1: 0, CategoryID: 4, + }, + // 0000000A0004 + { + MainID: 0x0000000A, Unk1: 0, CategoryID: 4, + }, + // 0000000B0004 + { + MainID: 0x0000000B, Unk1: 0, CategoryID: 4, + }, + // 0000000C0004 + { + MainID: 0x0000000C, Unk1: 0, CategoryID: 4, + }, + // 0000000D0004 + { + MainID: 0x0000000D, Unk1: 0, CategoryID: 4, + }, + // 0000000E0004 + { + MainID: 0x0000000E, Unk1: 0, CategoryID: 4, + }, + // 000000320005 + { + MainID: 0x00000032, Unk1: 0, CategoryID: 5, + }, + // 000000330005 + { + MainID: 0x00000033, Unk1: 0, CategoryID: 5, + }, + // 000000340005 + { + MainID: 0x00000034, Unk1: 0, CategoryID: 5, + }, + // 000000350005 + { + MainID: 0x00000035, Unk1: 0, CategoryID: 5, + }, + // 000000360005 + { + MainID: 0x00000036, Unk1: 0, CategoryID: 5, + }, + // 000000370005 + { + MainID: 0x00000037, Unk1: 0, CategoryID: 5, + }, + // 000000380005 + { + MainID: 0x00000038, Unk1: 0, CategoryID: 5, + }, + // 0000003A0005 + { + MainID: 0x0000003A, Unk1: 0, CategoryID: 5, + }, + // 0000003F0005 + { + MainID: 0x0000003F, Unk1: 0, CategoryID: 5, + }, + // 000000400005 + { + MainID: 0x00000040, Unk1: 0, CategoryID: 5, + }, + // 000000410005 + { + MainID: 0x00000041, Unk1: 0, CategoryID: 5, + }, + // 000000430005 + { + MainID: 0x00000043, Unk1: 0, CategoryID: 5, + }, + // 000000470005 + { + MainID: 0x00000047, Unk1: 0, CategoryID: 5, + }, + // 0000004B0005 + { + MainID: 0x0000004B, Unk1: 0, CategoryID: 5, + }, + // 0000003D0005 + { + MainID: 0x0000003D, Unk1: 0, CategoryID: 5, + }, + // 000000440005 + { + MainID: 0x00000044, Unk1: 0, CategoryID: 5, + }, + // 000000420005 + { + MainID: 0x00000042, Unk1: 0, CategoryID: 5, + }, + // 0000004C0005 + { + MainID: 0x0000004C, Unk1: 0, CategoryID: 5, + }, + // 000000460005 + { + MainID: 0x00000046, Unk1: 0, CategoryID: 5, + }, + // 0000004D0005 + { + MainID: 0x0000004D, Unk1: 0, CategoryID: 5, + }, + // 000000480005 + { + MainID: 0x00000048, Unk1: 0, CategoryID: 5, + }, + // 0000004A0005 + { + MainID: 0x0000004A, Unk1: 0, CategoryID: 5, + }, + // 000000490005 + { + MainID: 0x00000049, Unk1: 0, CategoryID: 5, + }, + // 0000004E0005 + { + MainID: 0x0000004E, Unk1: 0, CategoryID: 5, + }, + // 000000450005 + { + MainID: 0x00000045, Unk1: 0, CategoryID: 5, + }, + // 0000003E0005 + { + MainID: 0x0000003E, Unk1: 0, CategoryID: 5, + }, + // 0000004F0005 + { + MainID: 0x0000004F, Unk1: 0, CategoryID: 5, + }, + // 000000000106 + { + MainID: 0x00000000, Unk1: 1, CategoryID: 6, + }, + // 000000010106 + { + MainID: 0x00000001, Unk1: 1, CategoryID: 6, + }, + // 000000020106 + { + MainID: 0x00000002, Unk1: 1, CategoryID: 6, + }, + // 000000030106 + { + MainID: 0x00000003, Unk1: 1, CategoryID: 6, + }, + // 000000040106 + { + MainID: 0x00000004, Unk1: 1, CategoryID: 6, + }, + // 000000050106 + { + MainID: 0x00000005, Unk1: 1, CategoryID: 6, + }, + // 000000060106 + { + MainID: 0x00000006, Unk1: 1, CategoryID: 6, + }, + // 000000070106 + { + MainID: 0x00000007, Unk1: 1, CategoryID: 6, + }, + // 000000080106 + { + MainID: 0x00000008, Unk1: 1, CategoryID: 6, + }, + // 000000090106 + { + MainID: 0x00000009, Unk1: 1, CategoryID: 6, + }, + // 000000110106 + { + MainID: 0x00000011, Unk1: 1, CategoryID: 6, + }, + // 0000000A0106 + { + MainID: 0x0000000A, Unk1: 1, CategoryID: 6, + }, + // 0000000B0106 + { + MainID: 0x0000000B, Unk1: 1, CategoryID: 6, + }, + // 0000000C0106 + { + MainID: 0x0000000C, Unk1: 1, CategoryID: 6, + }, + // 0000000D0106 + { + MainID: 0x0000000D, Unk1: 1, CategoryID: 6, + }, + // 0000000E0106 + { + MainID: 0x0000000E, Unk1: 1, CategoryID: 6, + }, + // 0000000F0106 + { + MainID: 0x0000000F, Unk1: 1, CategoryID: 6, + }, + // 000000100106 + { + MainID: 0x00000010, Unk1: 1, CategoryID: 6, + }, + // 000000320107 + { + MainID: 0x00000032, Unk1: 1, CategoryID: 7, + }, + // 000000350107 + { + MainID: 0x00000035, Unk1: 1, CategoryID: 7, + }, + // 0000003E0107 + { + MainID: 0x0000003E, Unk1: 1, CategoryID: 7, + }, + // 000000340107 + { + MainID: 0x00000034, Unk1: 1, CategoryID: 7, + }, + // 000000380107 + { + MainID: 0x00000038, Unk1: 1, CategoryID: 7, + }, + // 000000330107 + { + MainID: 0x00000033, Unk1: 1, CategoryID: 7, + }, + // 000000310107 + { + MainID: 0x00000031, Unk1: 1, CategoryID: 7, + }, + // 000000360107 + { + MainID: 0x00000036, Unk1: 1, CategoryID: 7, + }, + // 000000390107 + { + MainID: 0x00000039, Unk1: 1, CategoryID: 7, + }, + // 000000370107 + { + MainID: 0x00000037, Unk1: 1, CategoryID: 7, + }, + // 0000003D0107 + { + MainID: 0x0000003D, Unk1: 1, CategoryID: 7, + }, + // 0000003A0107 + { + MainID: 0x0000003A, Unk1: 1, CategoryID: 7, + }, + // 0000003C0107 + { + MainID: 0x0000003C, Unk1: 1, CategoryID: 7, + }, + // 0000003B0107 + { + MainID: 0x0000003B, Unk1: 1, CategoryID: 7, + }, + // 0000002A0107 + { + MainID: 0x0000002A, Unk1: 1, CategoryID: 7, + }, + // 000000300107 + { + MainID: 0x00000030, Unk1: 1, CategoryID: 7, + }, + // 000000280107 + { + MainID: 0x00000028, Unk1: 1, CategoryID: 7, + }, + // 000000270107 + { + MainID: 0x00000027, Unk1: 1, CategoryID: 7, + }, + // 0000002B0107 + { + MainID: 0x0000002B, Unk1: 1, CategoryID: 7, + }, + // 0000002E0107 + { + MainID: 0x0000002E, Unk1: 1, CategoryID: 7, + }, + // 000000290107 + { + MainID: 0x00000029, Unk1: 1, CategoryID: 7, + }, + // 0000002C0107 + { + MainID: 0x0000002C, Unk1: 1, CategoryID: 7, + }, + // 0000002D0107 + { + MainID: 0x0000002D, Unk1: 1, CategoryID: 7, + }, + // 0000002F0107 + { + MainID: 0x0000002F, Unk1: 1, CategoryID: 7, + }, + // 000000250107 + { + MainID: 0x00000025, Unk1: 1, CategoryID: 7, + }, + // 000000220107 + { + MainID: 0x00000022, Unk1: 1, CategoryID: 7, + }, + // 000000210107 + { + MainID: 0x00000021, Unk1: 1, CategoryID: 7, + }, + // 000000200107 + { + MainID: 0x00000020, Unk1: 1, CategoryID: 7, + }, + // 0000001C0107 + { + MainID: 0x0000001C, Unk1: 1, CategoryID: 7, + }, + // 0000001A0107 + { + MainID: 0x0000001A, Unk1: 1, CategoryID: 7, + }, + // 000000240107 + { + MainID: 0x00000024, Unk1: 1, CategoryID: 7, + }, + // 000000260107 + { + MainID: 0x00000026, Unk1: 1, CategoryID: 7, + }, + // 000000230107 + { + MainID: 0x00000023, Unk1: 1, CategoryID: 7, + }, + // 0000001B0107 + { + MainID: 0x0000001B, Unk1: 1, CategoryID: 7, + }, + // 0000001E0107 + { + MainID: 0x0000001E, Unk1: 1, CategoryID: 7, + }, + // 0000001F0107 + { + MainID: 0x0000001F, Unk1: 1, CategoryID: 7, + }, + // 0000001D0107 + { + MainID: 0x0000001D, Unk1: 1, CategoryID: 7, + }, + // 000000180107 + { + MainID: 0x00000018, Unk1: 1, CategoryID: 7, + }, + // 000000170107 + { + MainID: 0x00000017, Unk1: 1, CategoryID: 7, + }, + // 000000160107 + { + MainID: 0x00000016, Unk1: 1, CategoryID: 7, + }, + // 000000150107 + // Missing file + // { + // MainID: 0x00000015, Unk1: 1, CategoryID: 7, + // }, + // 000000190107 + { + MainID: 0x00000019, Unk1: 1, CategoryID: 7, + }, + // 000000140107 + // Missing file + // { + // MainID: 0x00000014, Unk1: 1, CategoryID: 7, + // }, + // 000000070107 + // Missing file + // { + // MainID: 0x00000007, Unk1: 1, CategoryID: 7, + // }, + // 000000090107 + // Missing file + // { + // MainID: 0x00000009, Unk1: 1, CategoryID: 7, + // }, + // 0000000D0107 + // Missing file + // { + // MainID: 0x0000000D, Unk1: 1, CategoryID: 7, + // }, + // 000000100107 + // Missing file + // { + // MainID: 0x00000010, Unk1: 1, CategoryID: 7, + // }, + // 0000000C0107 + // Missing file + // { + // MainID: 0x0000000C, Unk1: 1, CategoryID: 7, + // }, + // 0000000E0107 + // Missing file + // { + // MainID: 0x0000000E, Unk1: 1, CategoryID: 7, + // }, + // 0000000F0107 + // Missing file + // { + // MainID: 0x0000000F, Unk1: 1, CategoryID: 7, + // }, + // 000000130107 + // Missing file + // { + // MainID: 0x00000013, Unk1: 1, CategoryID: 7, + // }, + // 0000000A0107 + // Missing file + // { + // MainID: 0x0000000A, Unk1: 1, CategoryID: 7, + // }, + // 000000080107 + // Missing file + // { + // MainID: 0x00000008, Unk1: 1, CategoryID: 7, + // }, + // 0000000B0107 + // Missing file + // { + // MainID: 0x0000000B, Unk1: 1, CategoryID: 7, + // }, + // 000000120107 + // Missing file + // { + // MainID: 0x00000012, Unk1: 1, CategoryID: 7, + // }, + // 000000110107 + // Missing file + // { + // MainID: 0x00000011, Unk1: 1, CategoryID: 7, + // }, + // 000000060107 + // Missing file + // { + // MainID: 0x00000006, Unk1: 1, CategoryID: 7, + // }, + // 000000050107 + // Missing file + // { + // MainID: 0x00000005, Unk1: 1, CategoryID: 7, + // }, + // 000000040107 + // Missing file + // { + // MainID: 0x00000004, Unk1: 1, CategoryID: 7, + // }, + // 000000030107 + { + MainID: 0x00000003, Unk1: 1, CategoryID: 7, + }, + // 000000020107 + { + MainID: 0x00000002, Unk1: 1, CategoryID: 7, + }, + // 000000010107 + { + MainID: 0x00000001, Unk1: 1, CategoryID: 7, + }, + // 000000000107 + { + MainID: 0x00000000, Unk1: 1, CategoryID: 7, + }, } resp := byteframe.NewByteFrame() diff --git a/Erupe/server/channelserver/handlers_achievement.go b/server/channelserver/handlers_achievement.go similarity index 100% rename from Erupe/server/channelserver/handlers_achievement.go rename to server/channelserver/handlers_achievement.go diff --git a/Erupe/server/channelserver/handlers_campaign.go b/server/channelserver/handlers_campaign.go similarity index 100% rename from Erupe/server/channelserver/handlers_campaign.go rename to server/channelserver/handlers_campaign.go diff --git a/Erupe/server/channelserver/handlers_caravan.go b/server/channelserver/handlers_caravan.go similarity index 100% rename from Erupe/server/channelserver/handlers_caravan.go rename to server/channelserver/handlers_caravan.go diff --git a/Erupe/server/channelserver/handlers_cast_binary.go b/server/channelserver/handlers_cast_binary.go similarity index 97% rename from Erupe/server/channelserver/handlers_cast_binary.go rename to server/channelserver/handlers_cast_binary.go index dd4fd9165..d76d8f589 100644 --- a/Erupe/server/channelserver/handlers_cast_binary.go +++ b/server/channelserver/handlers_cast_binary.go @@ -2,9 +2,9 @@ package channelserver import ( "fmt" - "strings" "math" "math/rand" + "strings" "time" "erupe-ce/common/byteframe" @@ -56,12 +56,12 @@ func handleMsgSysCastBinary(s *Session, p mhfpacket.MHFPacket) { if pkt.BroadcastType == 0x03 && pkt.MessageType == 0x03 && len(pkt.RawDataPayload) == 0x10 { if tmp.ReadUint16() == 0x0002 && tmp.ReadUint8() == 0x18 { - _ = tmp.ReadBytes(9) - tmp.SetLE() - frame := tmp.ReadUint32() - sendServerChatMessage(s, fmt.Sprintf("TIME : %d'%d.%03d (%dframe)", frame/30/60, frame/30%60, int(math.Round(float64(frame%30*100)/3)), frame)) - } - } + _ = tmp.ReadBytes(9) + tmp.SetLE() + frame := tmp.ReadUint32() + sendServerChatMessage(s, fmt.Sprintf("TIME : %d'%d.%03d (%dframe)", frame/30/60, frame/30%60, int(math.Round(float64(frame%30*100)/3)), frame)) + } + } // Parse out the real casted binary payload var msgBinTargeted *binpacket.MsgBinTargeted @@ -100,7 +100,7 @@ func handleMsgSysCastBinary(s *Session, p mhfpacket.MHFPacket) { roll.WriteUint16(authorLen) rand.Seed(time.Now().UnixNano()) dice := fmt.Sprintf("%d", rand.Intn(100)+1) - roll.WriteUint16(uint16(len(dice)+1)) + roll.WriteUint16(uint16(len(dice) + 1)) roll.WriteNullTerminatedBytes([]byte(dice)) roll.WriteNullTerminatedBytes(tmp.ReadNullTerminatedBytes()) realPayload = roll.Data() diff --git a/Erupe/server/channelserver/handlers_character.go b/server/channelserver/handlers_character.go similarity index 100% rename from Erupe/server/channelserver/handlers_character.go rename to server/channelserver/handlers_character.go diff --git a/Erupe/server/channelserver/handlers_clients.go b/server/channelserver/handlers_clients.go similarity index 100% rename from Erupe/server/channelserver/handlers_clients.go rename to server/channelserver/handlers_clients.go diff --git a/Erupe/server/channelserver/handlers_data.go b/server/channelserver/handlers_data.go similarity index 94% rename from Erupe/server/channelserver/handlers_data.go rename to server/channelserver/handlers_data.go index 9d1bf0c6a..2104808c5 100644 --- a/Erupe/server/channelserver/handlers_data.go +++ b/server/channelserver/handlers_data.go @@ -131,29 +131,140 @@ func grpToGR(n uint32) uint16 { } } } - gr = uint16(i + 2); break + gr = uint16(i + 2) + break case grp < 593400: // 51-99 - grp -= 208750; i := 51; for { if grp < 7850 {break}; i++; grp -= 7850 }; gr = uint16(i); break + grp -= 208750 + i := 51 + for { + if grp < 7850 { + break + } + i++ + grp -= 7850 + } + gr = uint16(i) + break case grp < 993400: // 100-149 - grp -= 593400; i := 100; for { if grp < 8000 {break}; i++; grp -= 8000 }; gr = uint16(i); break + grp -= 593400 + i := 100 + for { + if grp < 8000 { + break + } + i++ + grp -= 8000 + } + gr = uint16(i) + break case grp < 1400900: // 150-199 - grp -= 993400; i := 150; for { if grp < 8150 {break}; i++; grp -= 8150 }; gr = uint16(i); break + grp -= 993400 + i := 150 + for { + if grp < 8150 { + break + } + i++ + grp -= 8150 + } + gr = uint16(i) + break case grp < 2315900: // 200-299 - grp -= 1400900; i := 200; for { if grp < 9150 {break}; i++; grp -= 9150 }; gr = uint16(i); break + grp -= 1400900 + i := 200 + for { + if grp < 9150 { + break + } + i++ + grp -= 9150 + } + gr = uint16(i) + break case grp < 3340900: // 300-399 - grp -= 2315900; i := 300; for { if grp < 10250 {break}; i++; grp -= 10250 }; gr = uint16(i); break + grp -= 2315900 + i := 300 + for { + if grp < 10250 { + break + } + i++ + grp -= 10250 + } + gr = uint16(i) + break case grp < 4505900: // 400-499 - grp -= 3340900; i := 400; for { if grp < 11650 {break}; i++; grp -= 11650 }; gr = uint16(i); break + grp -= 3340900 + i := 400 + for { + if grp < 11650 { + break + } + i++ + grp -= 11650 + } + gr = uint16(i) + break case grp < 5850900: // 500-599 - grp -= 4505900; i := 500; for { if grp < 13450 {break}; i++; grp -= 13450 }; gr = uint16(i); break + grp -= 4505900 + i := 500 + for { + if grp < 13450 { + break + } + i++ + grp -= 13450 + } + gr = uint16(i) + break case grp < 7415900: // 600-699 - grp -= 5850900; i := 600; for { if grp < 15650 {break}; i++; grp -= 15650 }; gr = uint16(i); break + grp -= 5850900 + i := 600 + for { + if grp < 15650 { + break + } + i++ + grp -= 15650 + } + gr = uint16(i) + break case grp < 9230900: // 700-799 - grp -= 7415900; i := 700; for { if grp < 18150 {break}; i++; grp -= 18150 }; gr = uint16(i); break + grp -= 7415900 + i := 700 + for { + if grp < 18150 { + break + } + i++ + grp -= 18150 + } + gr = uint16(i) + break case grp < 11345900: // 800-899 - grp -= 9230900; i := 800; for { if grp < 21150 {break}; i++; grp -= 21150 }; gr = uint16(i); break + grp -= 9230900 + i := 800 + for { + if grp < 21150 { + break + } + i++ + grp -= 21150 + } + gr = uint16(i) + break default: // 900+ - grp -= 11345900; i := 900; for { if grp < 23950 {break}; i++; grp -= 23950 }; gr = uint16(i); break + grp -= 11345900 + i := 900 + for { + if grp < 23950 { + break + } + i++ + grp -= 23950 + } + gr = uint16(i) + break } return gr } @@ -162,8 +273,8 @@ func dumpSaveData(s *Session, data []byte, suffix string) { if !s.server.erupeConfig.DevModeOptions.SaveDumps.Enabled { return } else { - dir := filepath.Join(s.server.erupeConfig.DevModeOptions.SaveDumps.OutputDir, fmt.Sprintf("%s_",s.Name)) - path := filepath.Join(s.server.erupeConfig.DevModeOptions.SaveDumps.OutputDir, fmt.Sprintf("%s_",s.Name), fmt.Sprintf("%d_%s_%s%s.bin", s.charID, s.Name, Time_Current().Format("2006-01-02_15.04.05"), suffix)) + dir := filepath.Join(s.server.erupeConfig.DevModeOptions.SaveDumps.OutputDir, fmt.Sprintf("%s_", s.Name)) + path := filepath.Join(s.server.erupeConfig.DevModeOptions.SaveDumps.OutputDir, fmt.Sprintf("%s_", s.Name), fmt.Sprintf("%d_%s_%s%s.bin", s.charID, s.Name, Time_Current().Format("2006-01-02_15.04.05"), suffix)) if _, err := os.Stat(dir); os.IsNotExist(err) { os.Mkdir(dir, os.ModeDir) @@ -202,9 +313,9 @@ func handleMsgMhfLoaddata(s *Session, p mhfpacket.MHFPacket) { func handleMsgMhfSaveScenarioData(s *Session, p mhfpacket.MHFPacket) { pkt := p.(*mhfpacket.MsgMhfSaveScenarioData) _, err := s.server.db.Exec("UPDATE characters SET scenariodata = $1 WHERE characters.id = $2", pkt.RawDataPayload, int(s.charID)) - if err != nil { - s.logger.Fatal("Failed to update scenario data in db", zap.Error(err)) - } + if err != nil { + s.logger.Fatal("Failed to update scenario data in db", zap.Error(err)) + } // Do this ack manually because it uses a non-(0|1) error code s.QueueSendMHF(&mhfpacket.MsgSysAck{ AckHandle: pkt.AckHandle, diff --git a/Erupe/server/channelserver/handlers_discord.go b/server/channelserver/handlers_discord.go similarity index 100% rename from Erupe/server/channelserver/handlers_discord.go rename to server/channelserver/handlers_discord.go diff --git a/Erupe/server/channelserver/handlers_distitem.go b/server/channelserver/handlers_distitem.go similarity index 95% rename from Erupe/server/channelserver/handlers_distitem.go rename to server/channelserver/handlers_distitem.go index b6b64f9b2..91c980cff 100644 --- a/Erupe/server/channelserver/handlers_distitem.go +++ b/server/channelserver/handlers_distitem.go @@ -1,9 +1,9 @@ package channelserver import ( - "erupe-ce/network/mhfpacket" - ps "erupe-ce/common/pascalstring" "erupe-ce/common/byteframe" + ps "erupe-ce/common/pascalstring" + "erupe-ce/network/mhfpacket" "go.uber.org/zap" ) @@ -24,7 +24,7 @@ type ItemDist struct { } func handleMsgMhfEnumerateDistItem(s *Session, p mhfpacket.MHFPacket) { - pkt := p.(*mhfpacket.MsgMhfEnumerateDistItem) + pkt := p.(*mhfpacket.MsgMhfEnumerateDistItem) bf := byteframe.NewByteFrame() distCount := 0 dists, err := s.server.db.Queryx(` @@ -82,9 +82,9 @@ func handleMsgMhfEnumerateDistItem(s *Session, p mhfpacket.MHFPacket) { func handleMsgMhfApplyDistItem(s *Session, p mhfpacket.MHFPacket) { pkt := p.(*mhfpacket.MsgMhfApplyDistItem) - if pkt.DistributionID == 0 { - doAckBufSucceed(s, pkt.AckHandle, make([]byte, 6)) - } else { + if pkt.DistributionID == 0 { + doAckBufSucceed(s, pkt.AckHandle, make([]byte, 6)) + } else { row := s.server.db.QueryRowx("SELECT data FROM distribution WHERE id = $1", pkt.DistributionID) dist := &ItemDist{} err := row.StructScan(dist) @@ -97,7 +97,7 @@ func handleMsgMhfApplyDistItem(s *Session, p mhfpacket.MHFPacket) { bf := byteframe.NewByteFrame() bf.WriteUint32(pkt.DistributionID) bf.WriteBytes(dist.Data) - doAckBufSucceed(s, pkt.AckHandle, bf.Data()) + doAckBufSucceed(s, pkt.AckHandle, bf.Data()) _, err = s.server.db.Exec(` INSERT INTO public.distributions_accepted @@ -106,7 +106,7 @@ func handleMsgMhfApplyDistItem(s *Session, p mhfpacket.MHFPacket) { if err != nil { s.logger.Error("Error updating accepted dist count", zap.Error(err)) } - } + } } func handleMsgMhfAcquireDistItem(s *Session, p mhfpacket.MHFPacket) { diff --git a/Erupe/server/channelserver/handlers_diva.go b/server/channelserver/handlers_diva.go similarity index 100% rename from Erupe/server/channelserver/handlers_diva.go rename to server/channelserver/handlers_diva.go index 247653659..8927cd792 100644 --- a/Erupe/server/channelserver/handlers_diva.go +++ b/server/channelserver/handlers_diva.go @@ -3,8 +3,8 @@ package channelserver import ( "encoding/hex" - "erupe-ce/network/mhfpacket" "erupe-ce/common/byteframe" + "erupe-ce/network/mhfpacket" ) func handleMsgMhfGetKijuInfo(s *Session, p mhfpacket.MHFPacket) { diff --git a/Erupe/server/channelserver/handlers_event.go b/server/channelserver/handlers_event.go similarity index 99% rename from Erupe/server/channelserver/handlers_event.go rename to server/channelserver/handlers_event.go index 98bddbe3e..af16799c7 100644 --- a/Erupe/server/channelserver/handlers_event.go +++ b/server/channelserver/handlers_event.go @@ -66,7 +66,7 @@ func handleMsgMhfGetWeeklySchedule(s *Session, p mhfpacket.MHFPacket) { feat := generateActiveWeapons(14) // number of active weapons // TODO: only generate this once per restart (server should be restarted weekly) // then load data from db instead of regenerating - persistentEventSchedule[x+1] = activeFeature { + persistentEventSchedule[x+1] = activeFeature{ StartTime: Time_Current_Midnight().Add(time.Duration(24*x) * time.Hour), ActiveFeatures: uint32(feat), Unk1: 0, diff --git a/Erupe/server/channelserver/handlers_festa.go b/server/channelserver/handlers_festa.go similarity index 100% rename from Erupe/server/channelserver/handlers_festa.go rename to server/channelserver/handlers_festa.go diff --git a/Erupe/server/channelserver/handlers_guild.go b/server/channelserver/handlers_guild.go similarity index 99% rename from Erupe/server/channelserver/handlers_guild.go rename to server/channelserver/handlers_guild.go index 9051e8098..90eec5f00 100644 --- a/Erupe/server/channelserver/handlers_guild.go +++ b/server/channelserver/handlers_guild.go @@ -12,10 +12,10 @@ import ( "strings" "time" - "erupe-ce/common/byteframe" "erupe-ce/common/bfutil" - "erupe-ce/common/stringsupport" + "erupe-ce/common/byteframe" ps "erupe-ce/common/pascalstring" + "erupe-ce/common/stringsupport" "erupe-ce/network/mhfpacket" "github.com/jmoiron/sqlx" "go.uber.org/zap" @@ -750,7 +750,7 @@ func handleMsgMhfOperateGuild(s *Session, p mhfpacket.MHFPacket) { func handleRenamePugi(s *Session, data []byte, guild *Guild, num int) { bf := byteframe.NewByteFrameFromBytes(data) - _ = bf.ReadUint8() // len + _ = bf.ReadUint8() // len _ = bf.ReadUint32() // unk name := stringsupport.SJISToUTF8(bf.ReadNullTerminatedBytes()) switch num { @@ -1051,17 +1051,17 @@ func handleMsgMhfInfoGuild(s *Session, p mhfpacket.MHFPacket) { bf.WriteUint16(0x0000) /* - alliance application format - uint16 numapplicants (above) + alliance application format + uint16 numapplicants (above) - uint32 guild id - uint32 guild leader id (for mail) - uint32 unk (always null in pcap) - uint16 unk (always 0001 in pcap) - uint16 len guild name - string nullterm guild name - uint16 len guild leader name - string nullterm guild leader name + uint32 guild id + uint32 guild leader id (for mail) + uint32 unk (always null in pcap) + uint16 unk (always 0001 in pcap) + uint16 len guild name + string nullterm guild name + uint16 len guild leader name + string nullterm guild leader name */ if guild.Icon != nil { @@ -1673,7 +1673,7 @@ func handleMsgMhfLoadGuildCooking(s *Session, p mhfpacket.MHFPacket) { if err != nil { s.logger.Fatal("Failed to scan meal data", zap.Error(err)) } - if mealData.Expires > uint32(Time_Current_Adjusted().Add(-60 * time.Minute).Unix()) { + if mealData.Expires > uint32(Time_Current_Adjusted().Add(-60*time.Minute).Unix()) { count++ temp.WriteUint32(mealData.ID) temp.WriteUint32(mealData.MealID) @@ -1696,7 +1696,7 @@ func handleMsgMhfRegistGuildCooking(s *Session, p mhfpacket.MHFPacket) { s.logger.Fatal("Failed to delete meal in db", zap.Error(err)) } } - _, err := s.server.db.Exec("INSERT INTO guild_meals (guild_id, meal_id, level, expires) VALUES ($1, $2, $3, $4)", guild.ID, pkt.MealID, pkt.Success, Time_Current_Adjusted().Add(30 * time.Minute).Unix()) + _, err := s.server.db.Exec("INSERT INTO guild_meals (guild_id, meal_id, level, expires) VALUES ($1, $2, $3, $4)", guild.ID, pkt.MealID, pkt.Success, Time_Current_Adjusted().Add(30*time.Minute).Unix()) if err != nil { s.logger.Fatal("Failed to register meal in db", zap.Error(err)) } diff --git a/Erupe/server/channelserver/handlers_guild_adventure.go b/server/channelserver/handlers_guild_adventure.go similarity index 89% rename from Erupe/server/channelserver/handlers_guild_adventure.go rename to server/channelserver/handlers_guild_adventure.go index 90b6c3239..45f836127 100644 --- a/Erupe/server/channelserver/handlers_guild_adventure.go +++ b/server/channelserver/handlers_guild_adventure.go @@ -3,10 +3,10 @@ package channelserver import ( "time" - "erupe-ce/common/stringsupport" - "erupe-ce/common/byteframe" - "erupe-ce/network/mhfpacket" - "go.uber.org/zap" + "erupe-ce/common/byteframe" + "erupe-ce/common/stringsupport" + "erupe-ce/network/mhfpacket" + "go.uber.org/zap" ) type GuildAdventure struct { @@ -39,7 +39,7 @@ func handleMsgMhfLoadGuildAdventure(s *Session, p mhfpacket.MHFPacket) { temp.WriteUint32(adventureData.Charge) temp.WriteUint32(adventureData.Depart) temp.WriteUint32(adventureData.Return) - temp.WriteBool(stringsupport.CSVContains(adventureData.CollectedBy, int(s.charID))) + temp.WriteBool(stringsupport.CSVContains(adventureData.CollectedBy, int(s.charID))) } bf := byteframe.NewByteFrame() bf.WriteUint8(uint8(count)) @@ -50,7 +50,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, Time_Current_Adjusted().Unix(), Time_Current_Adjusted().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, Time_Current_Adjusted().Unix(), Time_Current_Adjusted().Add(6*time.Hour).Unix()) if err != nil { s.logger.Fatal("Failed to register guild adventure", zap.Error(err)) } @@ -64,7 +64,7 @@ func handleMsgMhfAcquireGuildAdventure(s *Session, p mhfpacket.MHFPacket) { if err != nil { s.logger.Fatal("Error parsing adventure collected by", zap.Error(err)) } else { - collectedBy = stringsupport.CSVAdd(collectedBy, int(s.charID)) + collectedBy = stringsupport.CSVAdd(collectedBy, int(s.charID)) _, err := s.server.db.Exec("UPDATE guild_adventures SET collected_by = $1 WHERE id = $2", collectedBy, pkt.ID) if err != nil { s.logger.Fatal("Failed to collect adventure in db", zap.Error(err)) @@ -85,7 +85,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, Time_Current_Adjusted().Unix(), Time_Current_Adjusted().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, Time_Current_Adjusted().Unix(), Time_Current_Adjusted().Add(1*time.Hour).Unix()) if err != nil { s.logger.Fatal("Failed to register guild adventure", zap.Error(err)) } diff --git a/Erupe/server/channelserver/handlers_guild_alliance.go b/server/channelserver/handlers_guild_alliance.go similarity index 91% rename from Erupe/server/channelserver/handlers_guild_alliance.go rename to server/channelserver/handlers_guild_alliance.go index accfcc555..77f204adc 100644 --- a/Erupe/server/channelserver/handlers_guild_alliance.go +++ b/server/channelserver/handlers_guild_alliance.go @@ -6,7 +6,7 @@ import ( "erupe-ce/network/mhfpacket" "github.com/jmoiron/sqlx" - "go.uber.org/zap" + "go.uber.org/zap" ) const allianceInfoSelectQuery = ` @@ -27,18 +27,18 @@ FROM guild_alliances ga ` type GuildAlliance struct { - ID uint32 `db:"id"` - Name string `db:"name"` - CreatedAt time.Time `db:"created_at"` - TotalMembers uint16 + ID uint32 `db:"id"` + Name string `db:"name"` + CreatedAt time.Time `db:"created_at"` + TotalMembers uint16 - ParentGuildID uint32 `db:"parent_id"` - SubGuild1ID uint32 `db:"sub1_id"` - SubGuild2ID uint32 `db:"sub2_id"` + ParentGuildID uint32 `db:"parent_id"` + SubGuild1ID uint32 `db:"sub1_id"` + SubGuild2ID uint32 `db:"sub2_id"` - ParentGuild Guild - SubGuild1 Guild - SubGuild2 Guild + ParentGuild Guild + SubGuild1 Guild + SubGuild2 Guild } func GetAllianceData(s *Session, AllianceID uint32) (*GuildAlliance, error) { diff --git a/Erupe/server/channelserver/handlers_guild_member.go b/server/channelserver/handlers_guild_member.go similarity index 100% rename from Erupe/server/channelserver/handlers_guild_member.go rename to server/channelserver/handlers_guild_member.go diff --git a/Erupe/server/channelserver/handlers_guild_scout.go b/server/channelserver/handlers_guild_scout.go similarity index 100% rename from Erupe/server/channelserver/handlers_guild_scout.go rename to server/channelserver/handlers_guild_scout.go index 41e166e91..30f41860b 100644 --- a/Erupe/server/channelserver/handlers_guild_scout.go +++ b/server/channelserver/handlers_guild_scout.go @@ -5,9 +5,9 @@ import ( "io" "time" + "erupe-ce/common/byteframe" "erupe-ce/common/stringsupport" "erupe-ce/network/mhfpacket" - "erupe-ce/common/byteframe" "go.uber.org/zap" ) diff --git a/Erupe/server/channelserver/handlers_guild_tresure.go b/server/channelserver/handlers_guild_tresure.go similarity index 100% rename from Erupe/server/channelserver/handlers_guild_tresure.go rename to server/channelserver/handlers_guild_tresure.go diff --git a/Erupe/server/channelserver/handlers_house.go b/server/channelserver/handlers_house.go similarity index 100% rename from Erupe/server/channelserver/handlers_house.go rename to server/channelserver/handlers_house.go diff --git a/Erupe/server/channelserver/handlers_kouryou.go b/server/channelserver/handlers_kouryou.go similarity index 100% rename from Erupe/server/channelserver/handlers_kouryou.go rename to server/channelserver/handlers_kouryou.go index 9c76a1b05..57f26ea40 100644 --- a/Erupe/server/channelserver/handlers_kouryou.go +++ b/server/channelserver/handlers_kouryou.go @@ -1,8 +1,8 @@ package channelserver import ( - "erupe-ce/network/mhfpacket" "erupe-ce/common/byteframe" + "erupe-ce/network/mhfpacket" "go.uber.org/zap" ) diff --git a/Erupe/server/channelserver/handlers_mail.go b/server/channelserver/handlers_mail.go similarity index 99% rename from Erupe/server/channelserver/handlers_mail.go rename to server/channelserver/handlers_mail.go index 1b407a515..ac6d5dcae 100644 --- a/Erupe/server/channelserver/handlers_mail.go +++ b/server/channelserver/handlers_mail.go @@ -4,9 +4,9 @@ import ( "database/sql" "time" + "erupe-ce/common/byteframe" "erupe-ce/network/binpacket" "erupe-ce/network/mhfpacket" - "erupe-ce/common/byteframe" "go.uber.org/zap" ) @@ -306,7 +306,6 @@ func handleMsgMhfListMail(s *Session, p mhfpacket.MHFPacket) { s.mailList[accIndex] = m.ID s.mailAccIndex++ - itemAttached := m.AttachedItemID != 0 subject := s.clientContext.StrConv.MustEncode(m.Subject) sender := s.clientContext.StrConv.MustEncode(m.SenderName) @@ -340,8 +339,8 @@ func handleMsgMhfListMail(s *Session, p mhfpacket.MHFPacket) { msg.WriteUint8(flags) msg.WriteBool(itemAttached) - msg.WriteUint8(uint8(len(subject)+1)) - msg.WriteUint8(uint8(len(sender)+1)) + msg.WriteUint8(uint8(len(subject) + 1)) + msg.WriteUint8(uint8(len(sender) + 1)) msg.WriteNullTerminatedBytes(subject) msg.WriteNullTerminatedBytes(sender) diff --git a/Erupe/server/channelserver/handlers_mercenary.go b/server/channelserver/handlers_mercenary.go similarity index 99% rename from Erupe/server/channelserver/handlers_mercenary.go rename to server/channelserver/handlers_mercenary.go index af70c55fe..606579fe5 100644 --- a/Erupe/server/channelserver/handlers_mercenary.go +++ b/server/channelserver/handlers_mercenary.go @@ -386,5 +386,4 @@ func GetCatDetails(bf *byteframe.ByteFrame) []CatDefinition { return cats } - /////////////////////////////////////////// diff --git a/Erupe/server/channelserver/handlers_mutex.go b/server/channelserver/handlers_mutex.go similarity index 100% rename from Erupe/server/channelserver/handlers_mutex.go rename to server/channelserver/handlers_mutex.go diff --git a/Erupe/server/channelserver/handlers_object.go b/server/channelserver/handlers_object.go similarity index 100% rename from Erupe/server/channelserver/handlers_object.go rename to server/channelserver/handlers_object.go diff --git a/Erupe/server/channelserver/handlers_plate.go b/server/channelserver/handlers_plate.go similarity index 100% rename from Erupe/server/channelserver/handlers_plate.go rename to server/channelserver/handlers_plate.go diff --git a/Erupe/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go similarity index 100% rename from Erupe/server/channelserver/handlers_quest.go rename to server/channelserver/handlers_quest.go diff --git a/Erupe/server/channelserver/handlers_register.go b/server/channelserver/handlers_register.go similarity index 100% rename from Erupe/server/channelserver/handlers_register.go rename to server/channelserver/handlers_register.go diff --git a/Erupe/server/channelserver/handlers_rengoku.go b/server/channelserver/handlers_rengoku.go similarity index 100% rename from Erupe/server/channelserver/handlers_rengoku.go rename to server/channelserver/handlers_rengoku.go index 0c2e95fdc..d7b60686b 100644 --- a/Erupe/server/channelserver/handlers_rengoku.go +++ b/server/channelserver/handlers_rengoku.go @@ -4,8 +4,8 @@ import ( "io/ioutil" "path/filepath" - "erupe-ce/network/mhfpacket" "erupe-ce/common/byteframe" + "erupe-ce/network/mhfpacket" "go.uber.org/zap" ) diff --git a/Erupe/server/channelserver/handlers_reserve.go b/server/channelserver/handlers_reserve.go similarity index 100% rename from Erupe/server/channelserver/handlers_reserve.go rename to server/channelserver/handlers_reserve.go diff --git a/Erupe/server/channelserver/handlers_reward.go b/server/channelserver/handlers_reward.go similarity index 100% rename from Erupe/server/channelserver/handlers_reward.go rename to server/channelserver/handlers_reward.go index 3791d4d89..b4a1abc6d 100644 --- a/Erupe/server/channelserver/handlers_reward.go +++ b/server/channelserver/handlers_reward.go @@ -3,8 +3,8 @@ package channelserver import ( "encoding/hex" - "erupe-ce/network/mhfpacket" "erupe-ce/common/byteframe" + "erupe-ce/network/mhfpacket" ) func handleMsgMhfGetAdditionalBeatReward(s *Session, p mhfpacket.MHFPacket) { diff --git a/Erupe/server/channelserver/handlers_semaphore.go b/server/channelserver/handlers_semaphore.go similarity index 100% rename from Erupe/server/channelserver/handlers_semaphore.go rename to server/channelserver/handlers_semaphore.go diff --git a/Erupe/server/channelserver/handlers_shop_gacha.go b/server/channelserver/handlers_shop_gacha.go similarity index 99% rename from Erupe/server/channelserver/handlers_shop_gacha.go rename to server/channelserver/handlers_shop_gacha.go index 910c73c07..8eca5b6c1 100644 --- a/Erupe/server/channelserver/handlers_shop_gacha.go +++ b/server/channelserver/handlers_shop_gacha.go @@ -735,4 +735,4 @@ func handleMsgMhfResetBoxGachaInfo(s *Session, p mhfpacket.MHFPacket) { panic(err) } doAckSimpleSucceed(s, pkt.AckHandle, []byte{0x00, 0x00, 0x00, 0x00}) -} \ No newline at end of file +} diff --git a/Erupe/server/channelserver/handlers_stage.go b/server/channelserver/handlers_stage.go similarity index 100% rename from Erupe/server/channelserver/handlers_stage.go rename to server/channelserver/handlers_stage.go diff --git a/Erupe/server/channelserver/handlers_table.go b/server/channelserver/handlers_table.go similarity index 100% rename from Erupe/server/channelserver/handlers_table.go rename to server/channelserver/handlers_table.go diff --git a/Erupe/server/channelserver/handlers_tactics.go b/server/channelserver/handlers_tactics.go similarity index 100% rename from Erupe/server/channelserver/handlers_tactics.go rename to server/channelserver/handlers_tactics.go diff --git a/Erupe/server/channelserver/handlers_tournament.go b/server/channelserver/handlers_tournament.go similarity index 100% rename from Erupe/server/channelserver/handlers_tournament.go rename to server/channelserver/handlers_tournament.go diff --git a/Erupe/server/channelserver/handlers_tower.go b/server/channelserver/handlers_tower.go similarity index 67% rename from Erupe/server/channelserver/handlers_tower.go rename to server/channelserver/handlers_tower.go index 7dad6c860..49029753f 100644 --- a/Erupe/server/channelserver/handlers_tower.go +++ b/server/channelserver/handlers_tower.go @@ -1,8 +1,8 @@ package channelserver import ( + "encoding/hex" "erupe-ce/network/mhfpacket" - "encoding/hex" ) func handleMsgMhfGetTowerInfo(s *Session, p mhfpacket.MHFPacket) { @@ -33,19 +33,19 @@ func handleMsgMhfGetTowerInfo(s *Session, p mhfpacket.MHFPacket) { 01 1d 01 fc 00 0b [00 00 00 05] 00 00 00 00 00 00 00 00 00 12 01 fc 00 0b 01 00 00 10 0a 21 8e ad 00 00 00 00 00 00 00 00 00 00 00 00 */ - switch pkt.InfoType { - case mhfpacket.TowerInfoTypeTowerRankPoint: - data, err = hex.DecodeString("0A218EAD0000000000000000000000010000000000000000") - case mhfpacket.TowerInfoTypeGetOwnTowerSkill: - //data, err = hex.DecodeString("0A218EAD000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000") - data, err = hex.DecodeString("0A218EAD0000000000000000000000010000001C0000000500050000000000020000000000000000000000000000000000030003000000000003000500050000000300030003000300030003000200030001000300020002000300010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000") - case mhfpacket.TowerInfoTypeUnk3: - panic("No known response values for TowerInfoTypeUnk3") - case mhfpacket.TowerInfoTypeTowerTouhaHistory: - data, err = hex.DecodeString("0A218EAD0000000000000000000000010000000000000000000000000000000000000000") - case mhfpacket.TowerInfoTypeUnk5: - data, err = hex.DecodeString("0A218EAD000000000000000000000000") - } + switch pkt.InfoType { + case mhfpacket.TowerInfoTypeTowerRankPoint: + data, err = hex.DecodeString("0A218EAD0000000000000000000000010000000000000000") + case mhfpacket.TowerInfoTypeGetOwnTowerSkill: + //data, err = hex.DecodeString("0A218EAD000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000") + data, err = hex.DecodeString("0A218EAD0000000000000000000000010000001C0000000500050000000000020000000000000000000000000000000000030003000000000003000500050000000300030003000300030003000200030001000300020002000300010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000") + case mhfpacket.TowerInfoTypeUnk3: + panic("No known response values for TowerInfoTypeUnk3") + case mhfpacket.TowerInfoTypeTowerTouhaHistory: + data, err = hex.DecodeString("0A218EAD0000000000000000000000010000000000000000000000000000000000000000") + case mhfpacket.TowerInfoTypeUnk5: + data, err = hex.DecodeString("0A218EAD000000000000000000000000") + } if err != nil { stubGetNoResults(s, pkt.AckHandle) @@ -60,4 +60,4 @@ func handleMsgMhfPostTowerInfo(s *Session, p mhfpacket.MHFPacket) { func handleMsgMhfGetGemInfo(s *Session, p mhfpacket.MHFPacket) {} -func handleMsgMhfPostGemInfo(s *Session, p mhfpacket.MHFPacket) {} \ No newline at end of file +func handleMsgMhfPostGemInfo(s *Session, p mhfpacket.MHFPacket) {} diff --git a/Erupe/server/channelserver/handlers_users.go b/server/channelserver/handlers_users.go similarity index 100% rename from Erupe/server/channelserver/handlers_users.go rename to server/channelserver/handlers_users.go diff --git a/Erupe/server/channelserver/sys_channel_server.go b/server/channelserver/sys_channel_server.go similarity index 100% rename from Erupe/server/channelserver/sys_channel_server.go rename to server/channelserver/sys_channel_server.go diff --git a/Erupe/server/channelserver/sys_semaphore.go b/server/channelserver/sys_semaphore.go similarity index 100% rename from Erupe/server/channelserver/sys_semaphore.go rename to server/channelserver/sys_semaphore.go diff --git a/Erupe/server/channelserver/sys_session.go b/server/channelserver/sys_session.go similarity index 100% rename from Erupe/server/channelserver/sys_session.go rename to server/channelserver/sys_session.go diff --git a/Erupe/server/channelserver/sys_stage.go b/server/channelserver/sys_stage.go similarity index 100% rename from Erupe/server/channelserver/sys_stage.go rename to server/channelserver/sys_stage.go diff --git a/Erupe/server/channelserver/sys_timefix.go b/server/channelserver/sys_timefix.go similarity index 100% rename from Erupe/server/channelserver/sys_timefix.go rename to server/channelserver/sys_timefix.go diff --git a/Erupe/server/channelserver/timeserver/time_mode.go b/server/channelserver/timeserver/time_mode.go similarity index 100% rename from Erupe/server/channelserver/timeserver/time_mode.go rename to server/channelserver/timeserver/time_mode.go diff --git a/Erupe/server/discordbot/discord_bot.go b/server/discordbot/discord_bot.go similarity index 100% rename from Erupe/server/discordbot/discord_bot.go rename to server/discordbot/discord_bot.go diff --git a/Erupe/server/entranceserver/crypto.go b/server/entranceserver/crypto.go similarity index 100% rename from Erupe/server/entranceserver/crypto.go rename to server/entranceserver/crypto.go diff --git a/Erupe/server/entranceserver/crypto_test.go b/server/entranceserver/crypto_test.go similarity index 100% rename from Erupe/server/entranceserver/crypto_test.go rename to server/entranceserver/crypto_test.go diff --git a/Erupe/server/entranceserver/entrance_server.go b/server/entranceserver/entrance_server.go similarity index 100% rename from Erupe/server/entranceserver/entrance_server.go rename to server/entranceserver/entrance_server.go diff --git a/Erupe/server/entranceserver/make_resp.go b/server/entranceserver/make_resp.go similarity index 100% rename from Erupe/server/entranceserver/make_resp.go rename to server/entranceserver/make_resp.go diff --git a/Erupe/server/launcherserver/handler.go b/server/launcherserver/handler.go similarity index 100% rename from Erupe/server/launcherserver/handler.go rename to server/launcherserver/handler.go diff --git a/Erupe/server/launcherserver/launcher_server.go b/server/launcherserver/launcher_server.go similarity index 100% rename from Erupe/server/launcherserver/launcher_server.go rename to server/launcherserver/launcher_server.go diff --git a/Erupe/server/launcherserver/routes.go b/server/launcherserver/routes.go similarity index 100% rename from Erupe/server/launcherserver/routes.go rename to server/launcherserver/routes.go diff --git a/Erupe/server/signserver/dbutils.go b/server/signserver/dbutils.go similarity index 90% rename from Erupe/server/signserver/dbutils.go rename to server/signserver/dbutils.go index 1b5662dc8..a7750b59f 100644 --- a/Erupe/server/signserver/dbutils.go +++ b/server/signserver/dbutils.go @@ -1,8 +1,8 @@ package signserver import ( - "time" "strings" + "time" "golang.org/x/crypto/bcrypt" ) @@ -75,15 +75,15 @@ func (s *Server) registerDBAccount(username string, password string) error { } type character struct { - ID uint32 `db:"id"` - IsFemale bool `db:"is_female"` - IsNewCharacter bool `db:"is_new_character"` - Name string `db:"name"` - UnkDescString string `db:"unk_desc_string"` - HRP uint16 `db:"hrp"` - GR uint16 `db:"gr"` - WeaponType uint16 `db:"weapon_type"` - LastLogin uint32 `db:"last_login"` + ID uint32 `db:"id"` + IsFemale bool `db:"is_female"` + IsNewCharacter bool `db:"is_new_character"` + Name string `db:"name"` + UnkDescString string `db:"unk_desc_string"` + HRP uint16 `db:"hrp"` + GR uint16 `db:"gr"` + WeaponType uint16 `db:"weapon_type"` + LastLogin uint32 `db:"last_login"` } func (s *Server) getCharactersForUser(uid int) ([]character, error) { @@ -113,7 +113,7 @@ type members struct { Name string `db:"name"` } -func (s *Server) getFriendsForCharacters(chars []character) ([]members) { +func (s *Server) getFriendsForCharacters(chars []character) []members { friends := make([]members, 0) for _, char := range chars { friendsCSV := "" @@ -122,7 +122,7 @@ func (s *Server) getFriendsForCharacters(chars []character) ([]members) { friendQuery := "SELECT id, name FROM characters WHERE id=" for i := 0; i < len(friendsSlice); i++ { friendQuery += friendsSlice[i] - if i + 1 != len(friendsSlice) { + if i+1 != len(friendsSlice) { friendQuery += " OR id=" } } @@ -142,7 +142,7 @@ func (s *Server) getFriendsForCharacters(chars []character) ([]members) { return friends } -func (s *Server) getGuildmatesForCharacters(chars []character) ([]members) { +func (s *Server) getGuildmatesForCharacters(chars []character) []members { guildmates := make([]members, 0) for _, char := range chars { var inGuild int diff --git a/Erupe/server/signserver/dsgn_resp.go b/server/signserver/dsgn_resp.go similarity index 87% rename from Erupe/server/signserver/dsgn_resp.go rename to server/signserver/dsgn_resp.go index cebd7eac4..18ea4e543 100644 --- a/Erupe/server/signserver/dsgn_resp.go +++ b/server/signserver/dsgn_resp.go @@ -63,13 +63,13 @@ func (s *Session) makeSignInResp(uid int) []byte { bf.WriteUint16(char.HRP) } - bf.WriteUint16(char.WeaponType) // Weapon, 0-13. - bf.WriteUint32(char.LastLogin) // Last login date, unix timestamp in seconds. - bf.WriteBool(char.IsFemale) // Sex, 0=male, 1=female. - bf.WriteBool(char.IsNewCharacter) // Is new character, 1 replaces character name with ?????. - bf.WriteUint8(0) // Old GR - bf.WriteBool(true) // Use uint16 GR, no reason not to - bf.WriteBytes(stringsupport.PaddedString(char.Name, 16, true)) // Character name + bf.WriteUint16(char.WeaponType) // Weapon, 0-13. + bf.WriteUint32(char.LastLogin) // Last login date, unix timestamp in seconds. + bf.WriteBool(char.IsFemale) // Sex, 0=male, 1=female. + bf.WriteBool(char.IsNewCharacter) // Is new character, 1 replaces character name with ?????. + bf.WriteUint8(0) // Old GR + bf.WriteBool(true) // Use uint16 GR, no reason not to + bf.WriteBytes(stringsupport.PaddedString(char.Name, 16, true)) // Character name bf.WriteBytes(stringsupport.PaddedString(char.UnkDescString, 32, false)) // unk str bf.WriteUint16(char.GR) bf.WriteUint16(0) // Unk diff --git a/Erupe/server/signserver/respid.go b/server/signserver/respid.go similarity index 100% rename from Erupe/server/signserver/respid.go rename to server/signserver/respid.go diff --git a/Erupe/server/signserver/session.go b/server/signserver/session.go similarity index 97% rename from Erupe/server/signserver/session.go rename to server/signserver/session.go index af900a84a..aef6508b1 100644 --- a/Erupe/server/signserver/session.go +++ b/server/signserver/session.go @@ -6,8 +6,8 @@ import ( "net" "sync" - "erupe-ce/network" "erupe-ce/common/byteframe" + "erupe-ce/network" "go.uber.org/zap" "golang.org/x/crypto/bcrypt" ) @@ -89,8 +89,8 @@ func (s *Session) handleDSGNRequest(bf *byteframe.ByteFrame) error { newCharaReq := false - if reqUsername[len(reqUsername) - 1] == 43 { // '+' - reqUsername = reqUsername[:len(reqUsername) - 1] + if reqUsername[len(reqUsername)-1] == 43 { // '+' + reqUsername = reqUsername[:len(reqUsername)-1] newCharaReq = true } diff --git a/Erupe/server/signserver/sign_server.go b/server/signserver/sign_server.go similarity index 100% rename from Erupe/server/signserver/sign_server.go rename to server/signserver/sign_server.go diff --git a/Erupe/www/erupe/css/main.css b/www/erupe/css/main.css similarity index 100% rename from Erupe/www/erupe/css/main.css rename to www/erupe/css/main.css diff --git a/Erupe/www/erupe/img/background.png b/www/erupe/img/background.png similarity index 100% rename from Erupe/www/erupe/img/background.png rename to www/erupe/img/background.png diff --git a/Erupe/www/erupe/img/button_charsel.png b/www/erupe/img/button_charsel.png similarity index 100% rename from Erupe/www/erupe/img/button_charsel.png rename to www/erupe/img/button_charsel.png diff --git a/Erupe/www/erupe/img/button_charsel_char.jpg b/www/erupe/img/button_charsel_char.jpg similarity index 100% rename from Erupe/www/erupe/img/button_charsel_char.jpg rename to www/erupe/img/button_charsel_char.jpg diff --git a/Erupe/www/erupe/img/button_charsel_hover.png b/www/erupe/img/button_charsel_hover.png similarity index 100% rename from Erupe/www/erupe/img/button_charsel_hover.png rename to www/erupe/img/button_charsel_hover.png diff --git a/Erupe/www/erupe/img/button_config.png b/www/erupe/img/button_config.png similarity index 100% rename from Erupe/www/erupe/img/button_config.png rename to www/erupe/img/button_config.png diff --git a/Erupe/www/erupe/img/button_config_hover.png b/www/erupe/img/button_config_hover.png similarity index 100% rename from Erupe/www/erupe/img/button_config_hover.png rename to www/erupe/img/button_config_hover.png diff --git a/Erupe/www/erupe/img/button_launch.png b/www/erupe/img/button_launch.png similarity index 100% rename from Erupe/www/erupe/img/button_launch.png rename to www/erupe/img/button_launch.png diff --git a/Erupe/www/erupe/img/button_launch_hover.png b/www/erupe/img/button_launch_hover.png similarity index 100% rename from Erupe/www/erupe/img/button_launch_hover.png rename to www/erupe/img/button_launch_hover.png diff --git a/Erupe/www/erupe/img/button_option.png b/www/erupe/img/button_option.png similarity index 100% rename from Erupe/www/erupe/img/button_option.png rename to www/erupe/img/button_option.png diff --git a/Erupe/www/erupe/img/button_option_hover.png b/www/erupe/img/button_option_hover.png similarity index 100% rename from Erupe/www/erupe/img/button_option_hover.png rename to www/erupe/img/button_option_hover.png diff --git a/Erupe/www/erupe/img/icons/bow.png b/www/erupe/img/icons/bow.png similarity index 100% rename from Erupe/www/erupe/img/icons/bow.png rename to www/erupe/img/icons/bow.png diff --git a/Erupe/www/erupe/img/icons/db.png b/www/erupe/img/icons/db.png similarity index 100% rename from Erupe/www/erupe/img/icons/db.png rename to www/erupe/img/icons/db.png diff --git a/Erupe/www/erupe/img/icons/discord.png b/www/erupe/img/icons/discord.png similarity index 100% rename from Erupe/www/erupe/img/icons/discord.png rename to www/erupe/img/icons/discord.png diff --git a/Erupe/www/erupe/img/icons/github.png b/www/erupe/img/icons/github.png similarity index 100% rename from Erupe/www/erupe/img/icons/github.png rename to www/erupe/img/icons/github.png diff --git a/Erupe/www/erupe/img/icons/gl.png b/www/erupe/img/icons/gl.png similarity index 100% rename from Erupe/www/erupe/img/icons/gl.png rename to www/erupe/img/icons/gl.png diff --git a/Erupe/www/erupe/img/icons/gs.png b/www/erupe/img/icons/gs.png similarity index 100% rename from Erupe/www/erupe/img/icons/gs.png rename to www/erupe/img/icons/gs.png diff --git a/Erupe/www/erupe/img/icons/hbg.png b/www/erupe/img/icons/hbg.png similarity index 100% rename from Erupe/www/erupe/img/icons/hbg.png rename to www/erupe/img/icons/hbg.png diff --git a/Erupe/www/erupe/img/icons/hh.png b/www/erupe/img/icons/hh.png similarity index 100% rename from Erupe/www/erupe/img/icons/hh.png rename to www/erupe/img/icons/hh.png diff --git a/Erupe/www/erupe/img/icons/hm.png b/www/erupe/img/icons/hm.png similarity index 100% rename from Erupe/www/erupe/img/icons/hm.png rename to www/erupe/img/icons/hm.png diff --git a/Erupe/www/erupe/img/icons/ico_title.png b/www/erupe/img/icons/ico_title.png similarity index 100% rename from Erupe/www/erupe/img/icons/ico_title.png rename to www/erupe/img/icons/ico_title.png diff --git a/Erupe/www/erupe/img/icons/lbg.png b/www/erupe/img/icons/lbg.png similarity index 100% rename from Erupe/www/erupe/img/icons/lbg.png rename to www/erupe/img/icons/lbg.png diff --git a/Erupe/www/erupe/img/icons/ln.png b/www/erupe/img/icons/ln.png similarity index 100% rename from Erupe/www/erupe/img/icons/ln.png rename to www/erupe/img/icons/ln.png diff --git a/Erupe/www/erupe/img/icons/ls.png b/www/erupe/img/icons/ls.png similarity index 100% rename from Erupe/www/erupe/img/icons/ls.png rename to www/erupe/img/icons/ls.png diff --git a/Erupe/www/erupe/img/icons/ms.png b/www/erupe/img/icons/ms.png similarity index 100% rename from Erupe/www/erupe/img/icons/ms.png rename to www/erupe/img/icons/ms.png diff --git a/Erupe/www/erupe/img/icons/sa.png b/www/erupe/img/icons/sa.png similarity index 100% rename from Erupe/www/erupe/img/icons/sa.png rename to www/erupe/img/icons/sa.png diff --git a/Erupe/www/erupe/img/icons/ss.png b/www/erupe/img/icons/ss.png similarity index 100% rename from Erupe/www/erupe/img/icons/ss.png rename to www/erupe/img/icons/ss.png diff --git a/Erupe/www/erupe/img/icons/tf.png b/www/erupe/img/icons/tf.png similarity index 100% rename from Erupe/www/erupe/img/icons/tf.png rename to www/erupe/img/icons/tf.png diff --git a/Erupe/www/erupe/img/icons/uk.png b/www/erupe/img/icons/uk.png similarity index 100% rename from Erupe/www/erupe/img/icons/uk.png rename to www/erupe/img/icons/uk.png diff --git a/Erupe/www/erupe/img/load.gif b/www/erupe/img/load.gif similarity index 100% rename from Erupe/www/erupe/img/load.gif rename to www/erupe/img/load.gif diff --git a/Erupe/www/erupe/img/logo.png b/www/erupe/img/logo.png similarity index 100% rename from Erupe/www/erupe/img/logo.png rename to www/erupe/img/logo.png diff --git a/Erupe/www/erupe/img/manual.png b/www/erupe/img/manual.png similarity index 100% rename from Erupe/www/erupe/img/manual.png rename to www/erupe/img/manual.png diff --git a/Erupe/www/erupe/img/modelbg.jpeg b/www/erupe/img/modelbg.jpeg similarity index 100% rename from Erupe/www/erupe/img/modelbg.jpeg rename to www/erupe/img/modelbg.jpeg diff --git a/Erupe/www/erupe/img/moreinfo.png b/www/erupe/img/moreinfo.png similarity index 100% rename from Erupe/www/erupe/img/moreinfo.png rename to www/erupe/img/moreinfo.png diff --git a/Erupe/www/erupe/img/pastebin.png b/www/erupe/img/pastebin.png similarity index 100% rename from Erupe/www/erupe/img/pastebin.png rename to www/erupe/img/pastebin.png diff --git a/Erupe/www/erupe/img/start_now.png b/www/erupe/img/start_now.png similarity index 100% rename from Erupe/www/erupe/img/start_now.png rename to www/erupe/img/start_now.png diff --git a/Erupe/www/erupe/index.html b/www/erupe/index.html similarity index 100% rename from Erupe/www/erupe/index.html rename to www/erupe/index.html diff --git a/Erupe/www/erupe/js/script.js b/www/erupe/js/script.js similarity index 100% rename from Erupe/www/erupe/js/script.js rename to www/erupe/js/script.js