refactored gametime and utils folder which decouples entrance and sign from channel servers

server/api/dbutils.go

@@ -3,7 +3,7 @@ package api
 import (
 	"context"
 	"database/sql"
-	"erupe-ce/common/token"
+	"erupe-ce/utils/token"
 	"fmt"
 	"time"
 

server/api/endpoints.go

@@ -6,7 +6,7 @@ import (
 	"encoding/xml"
 	"errors"
 	_config "erupe-ce/config"
-	"erupe-ce/server/channelserver"
+	"erupe-ce/utils/gametime"
 	"fmt"
 	"image"
 	"image/jpeg"
@@ -77,7 +77,7 @@ type ExportData struct {
 
 func (s *APIServer) newAuthData(userID uint32, userRights uint32, userTokenID uint32, userToken string, characters []Character) AuthData {
 	resp := AuthData{
-		CurrentTS:     uint32(channelserver.TimeAdjusted().Unix()),
+		CurrentTS:     uint32(gametime.TimeAdjusted().Unix()),
 		ExpiryTS:      uint32(s.getReturnExpiry(userID).Unix()),
 		EntranceCount: 1,
 		User: User{
@@ -99,9 +99,9 @@ func (s *APIServer) newAuthData(userID uint32, userRights uint32, userTokenID ui
 		stalls[4] = 2
 	}
 	resp.MezFes = &MezFes{
-		ID:           uint32(channelserver.TimeWeekStart().Unix()),
-		Start:        uint32(channelserver.TimeWeekStart().Add(-time.Duration(s.erupeConfig.GameplayOptions.MezFesDuration) * time.Second).Unix()),
-		End:          uint32(channelserver.TimeWeekNext().Unix()),
+		ID:           uint32(gametime.TimeWeekStart().Unix()),
+		Start:        uint32(gametime.TimeWeekStart().Add(-time.Duration(s.erupeConfig.GameplayOptions.MezFesDuration) * time.Second).Unix()),
+		End:          uint32(gametime.TimeWeekNext().Unix()),
 		SoloTickets:  s.erupeConfig.GameplayOptions.MezFesSoloTickets,
 		GroupTickets: s.erupeConfig.GameplayOptions.MezFesGroupTickets,
 		Stalls:       stalls,

server/channelserver/handlers.go

@@ -2,12 +2,13 @@ package channelserver
 
 import (
 	"encoding/binary"
-	"erupe-ce/common/mhfcourse"
-	"erupe-ce/common/mhfitem"
-	"erupe-ce/common/mhfmon"
-	ps "erupe-ce/common/pascalstring"
-	"erupe-ce/common/stringsupport"
 	_config "erupe-ce/config"
+	"erupe-ce/utils/gametime"
+	"erupe-ce/utils/mhfcourse"
+	"erupe-ce/utils/mhfitem"
+	"erupe-ce/utils/mhfmon"
+	ps "erupe-ce/utils/pascalstring"
+	"erupe-ce/utils/stringsupport"
 	"fmt"
 	"io"
 	"net"
@@ -15,8 +16,8 @@ import (
 	"time"
 
 	"crypto/rand"
-	"erupe-ce/common/byteframe"
 	"erupe-ce/network/mhfpacket"
+	"erupe-ce/utils/byteframe"
 	"math/bits"
 
 	"go.uber.org/zap"
@@ -144,7 +145,7 @@ func handleMsgSysLogin(s *Session, p mhfpacket.MHFPacket) {
 	s.Unlock()
 
 	bf := byteframe.NewByteFrame()
-	bf.WriteUint32(uint32(TimeAdjusted().Unix())) // Unix timestamp
+	bf.WriteUint32(uint32(gametime.TimeAdjusted().Unix())) // Unix timestamp
 
 	_, err := s.server.db.Exec("UPDATE servers SET current_players=$1 WHERE server_id=$2", len(s.server.sessions), s.server.ID)
 	if err != nil {
@@ -156,7 +157,7 @@ func handleMsgSysLogin(s *Session, p mhfpacket.MHFPacket) {
 		panic(err)
 	}
 
-	_, err = s.server.db.Exec("UPDATE characters SET last_login=$1 WHERE id=$2", TimeAdjusted().Unix(), s.charID)
+	_, err = s.server.db.Exec("UPDATE characters SET last_login=$1 WHERE id=$2", gametime.TimeAdjusted().Unix(), s.charID)
 	if err != nil {
 		panic(err)
 	}
@@ -217,7 +218,7 @@ func logoutPlayer(s *Session) {
 	var timePlayed int
 	var sessionTime int
 	_ = s.server.db.QueryRow("SELECT time_played FROM characters WHERE id = $1", s.charID).Scan(&timePlayed)
-	sessionTime = int(TimeAdjusted().Unix()) - int(s.sessionStart)
+	sessionTime = int(gametime.TimeAdjusted().Unix()) - int(s.sessionStart)
 	timePlayed += sessionTime
 
 	var rpGained int
@@ -275,7 +276,7 @@ func handleMsgSysPing(s *Session, p mhfpacket.MHFPacket) {
 func handleMsgSysTime(s *Session, p mhfpacket.MHFPacket) {
 	resp := &mhfpacket.MsgSysTime{
 		GetRemoteTime: false,
-		Timestamp:     uint32(TimeAdjusted().Unix()), // JP timezone
+		Timestamp:     uint32(gametime.TimeAdjusted().Unix()), // JP timezone
 	}
 	s.QueueSendMHF(resp)
 	s.notifyRavi()
@@ -312,7 +313,7 @@ func handleMsgSysRecordLog(s *Session, p mhfpacket.MHFPacket) {
 		for i := 0; i < 176; i++ {
 			val = bf.ReadUint8()
 			if val > 0 && mhfmon.Monsters[i].Large {
-				s.server.db.Exec(`INSERT INTO kill_logs (character_id, monster, quantity, timestamp) VALUES ($1, $2, $3, $4)`, s.charID, i, val, TimeAdjusted())
+				s.server.db.Exec(`INSERT INTO kill_logs (character_id, monster, quantity, timestamp) VALUES ($1, $2, $3, $4)`, s.charID, i, val, gametime.TimeAdjusted())
 			}
 		}
 	}
@@ -855,13 +856,13 @@ func handleMsgMhfCheckWeeklyStamp(s *Session, p mhfpacket.MHFPacket) {
 	var lastCheck time.Time
 	err := s.server.db.QueryRow(fmt.Sprintf("SELECT %s_checked FROM stamps WHERE character_id=$1", pkt.StampType), s.charID).Scan(&lastCheck)
 	if err != nil {
-		lastCheck = TimeAdjusted()
-		s.server.db.Exec("INSERT INTO stamps (character_id, hl_checked, ex_checked) VALUES ($1, $2, $2)", s.charID, TimeAdjusted())
+		lastCheck = gametime.TimeAdjusted()
+		s.server.db.Exec("INSERT INTO stamps (character_id, hl_checked, ex_checked) VALUES ($1, $2, $2)", s.charID, gametime.TimeAdjusted())
 	} else {
-		s.server.db.Exec(fmt.Sprintf(`UPDATE stamps SET %s_checked=$1 WHERE character_id=$2`, pkt.StampType), TimeAdjusted(), s.charID)
+		s.server.db.Exec(fmt.Sprintf(`UPDATE stamps SET %s_checked=$1 WHERE character_id=$2`, pkt.StampType), gametime.TimeAdjusted(), s.charID)
 	}
 
-	if lastCheck.Before(TimeWeekStart()) {
+	if lastCheck.Before(gametime.TimeWeekStart()) {
 		s.server.db.Exec(fmt.Sprintf("UPDATE stamps SET %s_total=%s_total+1 WHERE character_id=$1", pkt.StampType, pkt.StampType), s.charID)
 		updated = 1
 	}
@@ -873,7 +874,7 @@ func handleMsgMhfCheckWeeklyStamp(s *Session, p mhfpacket.MHFPacket) {
 	bf.WriteUint16(updated)
 	bf.WriteUint16(0)
 	bf.WriteUint16(0)
-	bf.WriteUint32(uint32(TimeWeekStart().Unix()))
+	bf.WriteUint32(uint32(gametime.TimeWeekStart().Unix()))
 	doAckBufSucceed(s, pkt.AckHandle, bf.Data())
 }
 
@@ -899,7 +900,7 @@ func handleMsgMhfExchangeWeeklyStamp(s *Session, p mhfpacket.MHFPacket) {
 	bf.WriteUint16(0)
 	bf.WriteUint16(tktStack.Item.ItemID)
 	bf.WriteUint16(tktStack.Quantity)
-	bf.WriteUint32(uint32(TimeWeekStart().Unix()))
+	bf.WriteUint32(uint32(gametime.TimeWeekStart().Unix()))
 	doAckBufSucceed(s, pkt.AckHandle, bf.Data())
 }
 
@@ -1009,7 +1010,7 @@ func handleMsgMhfGetEtcPoints(s *Session, p mhfpacket.MHFPacket) {
 
 	var dailyTime time.Time
 	_ = s.server.db.QueryRow("SELECT COALESCE(daily_time, $2) FROM characters WHERE id = $1", s.charID, time.Date(2000, 1, 1, 0, 0, 0, 0, time.UTC)).Scan(&dailyTime)
-	if TimeAdjusted().After(dailyTime) {
+	if gametime.TimeAdjusted().After(dailyTime) {
 		s.server.db.Exec("UPDATE characters SET bonus_quests = 0, daily_quests = 0 WHERE id=$1", s.charID)
 	}
 
@@ -1117,8 +1118,8 @@ func handleMsgMhfKickExportForce(s *Session, p mhfpacket.MHFPacket) {}
 func handleMsgMhfGetEarthStatus(s *Session, p mhfpacket.MHFPacket) {
 	pkt := p.(*mhfpacket.MsgMhfGetEarthStatus)
 	bf := byteframe.NewByteFrame()
-	bf.WriteUint32(uint32(TimeWeekStart().Unix())) // Start
-	bf.WriteUint32(uint32(TimeWeekNext().Unix()))  // End
+	bf.WriteUint32(uint32(gametime.TimeWeekStart().Unix())) // Start
+	bf.WriteUint32(uint32(gametime.TimeWeekNext().Unix()))  // End
 	bf.WriteInt32(s.server.erupeConfig.EarthStatus)
 	bf.WriteInt32(s.server.erupeConfig.EarthID)
 	for i, m := range s.server.erupeConfig.EarthMonsters {
@@ -1248,9 +1249,9 @@ func handleMsgMhfGetSeibattle(s *Session, p mhfpacket.MHFPacket) {
 	var data []*byteframe.ByteFrame
 	seibattle := Seibattle{
 		Timetable: []SeibattleTimetable{
-			{TimeMidnight(), TimeMidnight().Add(time.Hour * 8)},
-			{TimeMidnight().Add(time.Hour * 8), TimeMidnight().Add(time.Hour * 16)},
-			{TimeMidnight().Add(time.Hour * 16), TimeMidnight().Add(time.Hour * 24)},
+			{gametime.TimeMidnight(), gametime.TimeMidnight().Add(time.Hour * 8)},
+			{gametime.TimeMidnight().Add(time.Hour * 8), gametime.TimeMidnight().Add(time.Hour * 16)},
+			{gametime.TimeMidnight().Add(time.Hour * 16), gametime.TimeMidnight().Add(time.Hour * 24)},
 		},
 		KeyScore: []SeibattleKeyScore{
 			{0, 0},

server/channelserver/handlers_achievement.go

@@ -1,8 +1,8 @@
 package channelserver
 
 import (
-	"erupe-ce/common/byteframe"
 	"erupe-ce/network/mhfpacket"
+	"erupe-ce/utils/byteframe"
 	"fmt"
 	"io"
 )

server/channelserver/handlers_bbs.go

@@ -1,10 +1,10 @@
 package channelserver
 
 import (
-	"erupe-ce/common/byteframe"
-	"erupe-ce/common/stringsupport"
-	"erupe-ce/common/token"
 	"erupe-ce/network/mhfpacket"
+	"erupe-ce/utils/byteframe"
+	"erupe-ce/utils/stringsupport"
+	"erupe-ce/utils/token"
 )
 
 // Handler BBS handles all the interactions with the for the screenshot sending to bulitin board functionality. For it to work it requires the API to be hosted somehwere. This implementation supports discord.

server/channelserver/handlers_cafe.go

@@ -1,15 +1,18 @@
 package channelserver
 
 import (
-	"erupe-ce/common/byteframe"
-	"erupe-ce/common/mhfcourse"
-	ps "erupe-ce/common/pascalstring"
+	"erupe-ce/utils/byteframe"
+	"erupe-ce/utils/gametime"
+	"erupe-ce/utils/mhfcourse"
+
 	_config "erupe-ce/config"
 	"erupe-ce/network/mhfpacket"
+	ps "erupe-ce/utils/pascalstring"
 	"fmt"
-	"go.uber.org/zap"
 	"io"
 	"time"
+
+	"go.uber.org/zap"
 )
 
 func handleMsgMhfAcquireCafeItem(s *Session, p mhfpacket.MHFPacket) {
@@ -39,8 +42,8 @@ func handleMsgMhfUpdateCafepoint(s *Session, p mhfpacket.MHFPacket) {
 func handleMsgMhfCheckDailyCafepoint(s *Session, p mhfpacket.MHFPacket) {
 	pkt := p.(*mhfpacket.MsgMhfCheckDailyCafepoint)
 
-	midday := TimeMidnight().Add(12 * time.Hour)
-	if TimeAdjusted().After(midday) {
+	midday := gametime.TimeMidnight().Add(12 * time.Hour)
+	if gametime.TimeAdjusted().After(midday) {
 		midday = midday.Add(24 * time.Hour)
 	}
 
@@ -76,11 +79,11 @@ func handleMsgMhfGetCafeDuration(s *Session, p mhfpacket.MHFPacket) {
 	var cafeReset time.Time
 	err := s.server.db.QueryRow(`SELECT cafe_reset FROM characters WHERE id=$1`, s.charID).Scan(&cafeReset)
 	if err != nil {
-		cafeReset = TimeWeekNext()
+		cafeReset = gametime.TimeWeekNext()
 		s.server.db.Exec(`UPDATE characters SET cafe_reset=$1 WHERE id=$2`, cafeReset, s.charID)
 	}
-	if TimeAdjusted().After(cafeReset) {
-		cafeReset = TimeWeekNext()
+	if gametime.TimeAdjusted().After(cafeReset) {
+		cafeReset = gametime.TimeWeekNext()
 		s.server.db.Exec(`UPDATE characters SET cafe_time=0, cafe_reset=$1 WHERE id=$2`, cafeReset, s.charID)
 		s.server.db.Exec(`DELETE FROM cafe_accepted WHERE character_id=$1`, s.charID)
 	}
@@ -91,7 +94,7 @@ func handleMsgMhfGetCafeDuration(s *Session, p mhfpacket.MHFPacket) {
 		panic(err)
 	}
 	if mhfcourse.CourseExists(30, s.courses) {
-		cafeTime = uint32(TimeAdjusted().Unix()) - uint32(s.sessionStart) + cafeTime
+		cafeTime = uint32(gametime.TimeAdjusted().Unix()) - uint32(s.sessionStart) + cafeTime
 	}
 	bf.WriteUint32(cafeTime)
 	if _config.ErupeConfig.RealClientMode >= _config.ZZ {
@@ -142,7 +145,7 @@ func handleMsgMhfGetCafeDurationBonusInfo(s *Session, p mhfpacket.MHFPacket) {
 		}
 		resp := byteframe.NewByteFrame()
 		resp.WriteUint32(0)
-		resp.WriteUint32(uint32(TimeAdjusted().Unix()))
+		resp.WriteUint32(uint32(gametime.TimeAdjusted().Unix()))
 		resp.WriteUint32(count)
 		resp.WriteBytes(bf.Data())
 		doAckBufSucceed(s, pkt.AckHandle, resp.Data())
@@ -165,7 +168,7 @@ func handleMsgMhfReceiveCafeDurationBonus(s *Session, p mhfpacket.MHFPacket) {
 		SELECT ch.cafe_time + $2
 		FROM characters ch
 		WHERE ch.id = $1 
-	) >= time_req`, s.charID, TimeAdjusted().Unix()-s.sessionStart)
+	) >= time_req`, s.charID, gametime.TimeAdjusted().Unix()-s.sessionStart)
 	if err != nil {
 		doAckBufSucceed(s, pkt.AckHandle, bf.Data())
 	} else {
@@ -222,7 +225,7 @@ func addPointNetcafe(s *Session, p int) error {
 func handleMsgMhfStartBoostTime(s *Session, p mhfpacket.MHFPacket) {
 	pkt := p.(*mhfpacket.MsgMhfStartBoostTime)
 	bf := byteframe.NewByteFrame()
-	boostLimit := TimeAdjusted().Add(time.Duration(s.server.erupeConfig.GameplayOptions.BoostTimeDuration) * time.Second)
+	boostLimit := gametime.TimeAdjusted().Add(time.Duration(s.server.erupeConfig.GameplayOptions.BoostTimeDuration) * time.Second)
 	if s.server.erupeConfig.GameplayOptions.DisableBoostTime {
 		bf.WriteUint32(0)
 		doAckBufSucceed(s, pkt.AckHandle, bf.Data())
@@ -260,7 +263,7 @@ func handleMsgMhfGetBoostRight(s *Session, p mhfpacket.MHFPacket) {
 		doAckBufSucceed(s, pkt.AckHandle, []byte{0x00, 0x00, 0x00, 0x00})
 		return
 	}
-	if boostLimit.After(TimeAdjusted()) {
+	if boostLimit.After(gametime.TimeAdjusted()) {
 		doAckBufSucceed(s, pkt.AckHandle, []byte{0x00, 0x00, 0x00, 0x01})
 	} else {
 		doAckBufSucceed(s, pkt.AckHandle, []byte{0x00, 0x00, 0x00, 0x02})

server/channelserver/handlers_campaign.go

@@ -1,11 +1,11 @@
 package channelserver
 
 import (
-	"erupe-ce/common/byteframe"
-	ps "erupe-ce/common/pascalstring"
-	"erupe-ce/common/stringsupport"
 	_config "erupe-ce/config"
 	"erupe-ce/network/mhfpacket"
+	"erupe-ce/utils/byteframe"
+	ps "erupe-ce/utils/pascalstring"
+	"erupe-ce/utils/stringsupport"
 	"time"
 )
 

server/channelserver/handlers_caravan.go

@@ -1,9 +1,9 @@
 package channelserver
 
 import (
-	"erupe-ce/common/byteframe"
-	"erupe-ce/common/stringsupport"
 	"erupe-ce/network/mhfpacket"
+	"erupe-ce/utils/byteframe"
+	"erupe-ce/utils/stringsupport"
 	"time"
 )
 

server/channelserver/handlers_cast_binary.go

@@ -3,21 +3,22 @@ package channelserver
 import (
 	"crypto/rand"
 	"encoding/hex"
-	"erupe-ce/common/byteframe"
-	"erupe-ce/common/mhfcid"
-	"erupe-ce/common/mhfcourse"
-	"erupe-ce/common/token"
-	"erupe-ce/config"
+	_config "erupe-ce/config"
 	"erupe-ce/network"
 	"erupe-ce/network/binpacket"
 	"erupe-ce/network/mhfpacket"
+	"erupe-ce/utils/byteframe"
+	"erupe-ce/utils/mhfcid"
+	"erupe-ce/utils/mhfcourse"
+	"erupe-ce/utils/token"
 	"fmt"
-	"golang.org/x/exp/slices"
 	"math"
 	"strconv"
 	"strings"
 	"time"
 
+	"golang.org/x/exp/slices"
+
 	"go.uber.org/zap"
 )
 

server/channelserver/handlers_character.go

@@ -3,12 +3,13 @@ package channelserver
 import (
 	"encoding/binary"
 	"errors"
-	"erupe-ce/common/bfutil"
-	"erupe-ce/common/stringsupport"
 	_config "erupe-ce/config"
+	"erupe-ce/utils/bfutil"
+	"erupe-ce/utils/stringsupport"
 
 	"erupe-ce/network/mhfpacket"
 	"erupe-ce/server/channelserver/compression/nullcomp"
+
 	"go.uber.org/zap"
 )
 

server/channelserver/handlers_clients.go

@@ -1,9 +1,10 @@
 package channelserver
 
 import (
-	"erupe-ce/common/byteframe"
-	"erupe-ce/common/stringsupport"
 	"erupe-ce/network/mhfpacket"
+	"erupe-ce/utils/byteframe"
+	"erupe-ce/utils/stringsupport"
+
 	"go.uber.org/zap"
 )
 

server/channelserver/handlers_data.go

@@ -1,19 +1,21 @@
 package channelserver
 
 import (
-	"erupe-ce/common/mhfmon"
-	"erupe-ce/common/stringsupport"
 	_config "erupe-ce/config"
+	"erupe-ce/utils/gametime"
+	"erupe-ce/utils/mhfmon"
+	"erupe-ce/utils/stringsupport"
 	"fmt"
 	"io"
 	"os"
 	"path/filepath"
 	"time"
 
-	"erupe-ce/common/byteframe"
 	"erupe-ce/network/mhfpacket"
 	"erupe-ce/server/channelserver/compression/deltacomp"
 	"erupe-ce/server/channelserver/compression/nullcomp"
+	"erupe-ce/utils/byteframe"
+
 	"go.uber.org/zap"
 )
 
@@ -1004,7 +1006,7 @@ func handleMsgMhfGetPaperData(s *Session, p mhfpacket.MHFPacket) {
 	switch pkt.Unk2 {
 	case 0:
 		paperMissions = PaperMission{
-			[]PaperMissionTimetable{{TimeMidnight(), TimeMidnight().Add(24 * time.Hour)}},
+			[]PaperMissionTimetable{{gametime.TimeMidnight(), gametime.TimeMidnight().Add(24 * time.Hour)}},
 			[]PaperMissionData{},
 		}
 	case 5:

server/channelserver/handlers_distitem.go

@@ -1,10 +1,10 @@
 package channelserver
 
 import (
-	"erupe-ce/common/byteframe"
-	ps "erupe-ce/common/pascalstring"
 	_config "erupe-ce/config"
 	"erupe-ce/network/mhfpacket"
+	"erupe-ce/utils/byteframe"
+	ps "erupe-ce/utils/pascalstring"
 	"time"
 
 	"go.uber.org/zap"

server/channelserver/handlers_diva.go

@@ -2,12 +2,13 @@ package channelserver
 
 import (
 	"encoding/hex"
-	"erupe-ce/common/stringsupport"
 	_config "erupe-ce/config"
+	"erupe-ce/utils/gametime"
+	"erupe-ce/utils/stringsupport"
 	"time"
 
-	"erupe-ce/common/byteframe"
 	"erupe-ce/network/mhfpacket"
+	"erupe-ce/utils/byteframe"
 )
 
 func cleanupDiva(s *Session) {
@@ -16,7 +17,7 @@ func cleanupDiva(s *Session) {
 
 func generateDivaTimestamps(s *Session, start uint32, debug bool) []uint32 {
 	timestamps := make([]uint32, 6)
-	midnight := TimeMidnight()
+	midnight := gametime.TimeMidnight()
 	if debug && start <= 3 {
 		midnight := uint32(midnight.Unix())
 		switch start {
@@ -44,7 +45,7 @@ func generateDivaTimestamps(s *Session, start uint32, debug bool) []uint32 {
 		}
 		return timestamps
 	}
-	if start == 0 || TimeAdjusted().Unix() > int64(start)+2977200 {
+	if start == 0 || gametime.TimeAdjusted().Unix() > int64(start)+2977200 {
 		cleanupDiva(s)
 		// Generate a new diva defense, starting midnight tomorrow
 		start = uint32(midnight.Add(24 * time.Hour).Unix())

server/channelserver/handlers_event.go

@@ -1,13 +1,14 @@
 package channelserver
 
 import (
-	"erupe-ce/common/token"
 	_config "erupe-ce/config"
+	"erupe-ce/utils/gametime"
+	"erupe-ce/utils/token"
 	"math"
 	"time"
 
-	"erupe-ce/common/byteframe"
 	"erupe-ce/network/mhfpacket"
+	"erupe-ce/utils/byteframe"
 )
 
 type Event struct {
@@ -57,9 +58,9 @@ func handleMsgMhfGetWeeklySchedule(s *Session, p mhfpacket.MHFPacket) {
 
 	var features []activeFeature
 	times := []time.Time{
-		TimeMidnight().Add(-24 * time.Hour),
-		TimeMidnight(),
-		TimeMidnight().Add(24 * time.Hour),
+		gametime.TimeMidnight().Add(-24 * time.Hour),
+		gametime.TimeMidnight(),
+		gametime.TimeMidnight().Add(24 * time.Hour),
 	}
 
 	for _, t := range times {
@@ -76,7 +77,7 @@ func handleMsgMhfGetWeeklySchedule(s *Session, p mhfpacket.MHFPacket) {
 
 	bf := byteframe.NewByteFrame()
 	bf.WriteUint8(uint8(len(features)))
-	bf.WriteUint32(uint32(TimeAdjusted().Add(-5 * time.Minute).Unix()))
+	bf.WriteUint32(uint32(gametime.TimeAdjusted().Add(-5 * time.Minute).Unix()))
 	for _, feature := range features {
 		bf.WriteUint32(uint32(feature.StartTime.Unix()))
 		bf.WriteUint32(feature.ActiveFeatures)
@@ -146,7 +147,7 @@ func handleMsgMhfGetKeepLoginBoostStatus(s *Session, p mhfpacket.MHFPacket) {
 		loginBoosts = append(loginBoosts, temp)
 	}
 	if len(loginBoosts) == 0 {
-		temp := TimeWeekStart()
+		temp := gametime.TimeWeekStart()
 		loginBoosts = []loginBoost{
 			{WeekReq: 1, Expiration: temp},
 			{WeekReq: 2, Expiration: temp},
@@ -161,13 +162,13 @@ func handleMsgMhfGetKeepLoginBoostStatus(s *Session, p mhfpacket.MHFPacket) {
 
 	for _, boost := range loginBoosts {
 		// Reset if next week
-		if !boost.Reset.IsZero() && boost.Reset.Before(TimeAdjusted()) {
-			boost.Expiration = TimeWeekStart()
+		if !boost.Reset.IsZero() && boost.Reset.Before(gametime.TimeAdjusted()) {
+			boost.Expiration = gametime.TimeWeekStart()
 			boost.Reset = time.Time{}
 			s.server.db.Exec(`UPDATE login_boost SET expiration=$1, reset=$2 WHERE char_id=$3 AND week_req=$4`, boost.Expiration, boost.Reset, s.charID, boost.WeekReq)
 		}
 
-		boost.WeekCount = uint8((TimeAdjusted().Unix()-boost.Expiration.Unix())/604800 + 1)
+		boost.WeekCount = uint8((gametime.TimeAdjusted().Unix()-boost.Expiration.Unix())/604800 + 1)
 
 		if boost.WeekCount >= boost.WeekReq {
 			boost.Active = true
@@ -175,7 +176,7 @@ func handleMsgMhfGetKeepLoginBoostStatus(s *Session, p mhfpacket.MHFPacket) {
 		}
 
 		// Show reset timer on expired boosts
-		if boost.Reset.After(TimeAdjusted()) {
+		if boost.Reset.After(gametime.TimeAdjusted()) {
 			boost.Active = true
 			boost.WeekCount = 0
 		}
@@ -200,14 +201,14 @@ func handleMsgMhfUseKeepLoginBoost(s *Session, p mhfpacket.MHFPacket) {
 	bf.WriteUint8(0)
 	switch pkt.BoostWeekUsed {
 	case 1, 3:
-		expiration = TimeAdjusted().Add(120 * time.Minute)
+		expiration = gametime.TimeAdjusted().Add(120 * time.Minute)
 	case 4:
-		expiration = TimeAdjusted().Add(180 * time.Minute)
+		expiration = gametime.TimeAdjusted().Add(180 * time.Minute)
 	case 2, 5:
-		expiration = TimeAdjusted().Add(240 * time.Minute)
+		expiration = gametime.TimeAdjusted().Add(240 * time.Minute)
 	}
 	bf.WriteUint32(uint32(expiration.Unix()))
-	s.server.db.Exec(`UPDATE login_boost SET expiration=$1, reset=$2 WHERE char_id=$3 AND week_req=$4`, expiration, TimeWeekNext(), s.charID, pkt.BoostWeekUsed)
+	s.server.db.Exec(`UPDATE login_boost SET expiration=$1, reset=$2 WHERE char_id=$3 AND week_req=$4`, expiration, gametime.TimeWeekNext(), s.charID, pkt.BoostWeekUsed)
 	doAckBufSucceed(s, pkt.AckHandle, bf.Data())
 }
 

server/channelserver/handlers_festa.go

@@ -1,11 +1,12 @@
 package channelserver
 
 import (
-	"erupe-ce/common/byteframe"
-	ps "erupe-ce/common/pascalstring"
-	"erupe-ce/common/token"
 	_config "erupe-ce/config"
 	"erupe-ce/network/mhfpacket"
+	"erupe-ce/utils/byteframe"
+	"erupe-ce/utils/gametime"
+	ps "erupe-ce/utils/pascalstring"
+	"erupe-ce/utils/token"
 	"sort"
 	"time"
 )
@@ -41,7 +42,7 @@ func handleMsgMhfEnumerateRanking(s *Session, p mhfpacket.MHFPacket) {
 	// Unk
 	// Start?
 	// End?
-	midnight := TimeMidnight()
+	midnight := gametime.TimeMidnight()
 	switch state {
 	case 1:
 		bf.WriteUint32(uint32(midnight.Unix()))
@@ -60,13 +61,13 @@ func handleMsgMhfEnumerateRanking(s *Session, p mhfpacket.MHFPacket) {
 		bf.WriteUint32(uint32(midnight.Add(7 * 24 * time.Hour).Unix()))
 	default:
 		bf.WriteBytes(make([]byte, 16))
-		bf.WriteUint32(uint32(TimeAdjusted().Unix())) // TS Current Time
+		bf.WriteUint32(uint32(gametime.TimeAdjusted().Unix())) // TS Current Time
 		bf.WriteUint8(3)
 		bf.WriteBytes(make([]byte, 4))
 		doAckBufSucceed(s, pkt.AckHandle, bf.Data())
 		return
 	}
-	bf.WriteUint32(uint32(TimeAdjusted().Unix())) // TS Current Time
+	bf.WriteUint32(uint32(gametime.TimeAdjusted().Unix())) // TS Current Time
 	bf.WriteUint8(3)
 	ps.Uint8(bf, "", false)
 	bf.WriteUint16(0) // numEvents
@@ -102,7 +103,7 @@ func cleanupFesta(s *Session) {
 
 func generateFestaTimestamps(s *Session, start uint32, debug bool) []uint32 {
 	timestamps := make([]uint32, 5)
-	midnight := TimeMidnight()
+	midnight := gametime.TimeMidnight()
 	if debug && start <= 3 {
 		midnight := uint32(midnight.Unix())
 		switch start {
@@ -127,7 +128,7 @@ func generateFestaTimestamps(s *Session, start uint32, debug bool) []uint32 {
 		}
 		return timestamps
 	}
-	if start == 0 || TimeAdjusted().Unix() > int64(start)+2977200 {
+	if start == 0 || gametime.TimeAdjusted().Unix() > int64(start)+2977200 {
 		cleanupFesta(s)
 		// Generate a new festa, starting midnight tomorrow
 		start = uint32(midnight.Add(24 * time.Hour).Unix())
@@ -184,7 +185,7 @@ func handleMsgMhfInfoFesta(s *Session, p mhfpacket.MHFPacket) {
 		timestamps = generateFestaTimestamps(s, start, false)
 	}
 
-	if timestamps[0] > uint32(TimeAdjusted().Unix()) {
+	if timestamps[0] > uint32(gametime.TimeAdjusted().Unix()) {
 		doAckBufSucceed(s, pkt.AckHandle, make([]byte, 4))
 		return
 	}
@@ -197,7 +198,7 @@ func handleMsgMhfInfoFesta(s *Session, p mhfpacket.MHFPacket) {
 	for _, timestamp := range timestamps {
 		bf.WriteUint32(timestamp)
 	}
-	bf.WriteUint32(uint32(TimeAdjusted().Unix()))
+	bf.WriteUint32(uint32(gametime.TimeAdjusted().Unix()))
 	bf.WriteUint8(4)
 	ps.Uint8(bf, "", false)
 	bf.WriteUint32(0)

server/channelserver/handlers_guild.go

@@ -5,18 +5,20 @@ import (
 	"database/sql/driver"
 	"encoding/json"
 	"errors"
-	"erupe-ce/common/mhfitem"
 	_config "erupe-ce/config"
+	"erupe-ce/utils/gametime"
+	"erupe-ce/utils/mhfitem"
 	"fmt"
 	"math"
 	"sort"
 	"strings"
 	"time"
 
-	"erupe-ce/common/byteframe"
-	ps "erupe-ce/common/pascalstring"
-	"erupe-ce/common/stringsupport"
 	"erupe-ce/network/mhfpacket"
+	"erupe-ce/utils/byteframe"
+	ps "erupe-ce/utils/pascalstring"
+	"erupe-ce/utils/stringsupport"
+
 	"github.com/jmoiron/sqlx"
 	"go.uber.org/zap"
 )
@@ -825,7 +827,7 @@ func handleDonateRP(s *Session, amount uint16, guild *Guild, _type int) []byte {
 	case 2:
 		if resetRoom {
 			s.server.db.Exec(`UPDATE guilds SET room_rp = 0 WHERE id = $1`, guild.ID)
-			s.server.db.Exec(`UPDATE guilds SET room_expiry = $1 WHERE id = $2`, TimeAdjusted().Add(time.Hour*24*7), guild.ID)
+			s.server.db.Exec(`UPDATE guilds SET room_expiry = $1 WHERE id = $2`, gametime.TimeAdjusted().Add(time.Hour*24*7), guild.ID)
 		} else {
 			s.server.db.Exec(`UPDATE guilds SET room_rp = room_rp + $1 WHERE id = $2`, amount, guild.ID)
 		}
@@ -1720,7 +1722,7 @@ func handleMsgMhfGetGuildMissionList(s *Session, p mhfpacket.MHFPacket) {
 		bf.WriteBool(mission.GR)
 		bf.WriteUint16(mission.RewardType)
 		bf.WriteUint16(mission.RewardLevel)
-		bf.WriteUint32(uint32(TimeAdjusted().Unix()))
+		bf.WriteUint32(uint32(gametime.TimeAdjusted().Unix()))
 	}
 	doAckBufSucceed(s, pkt.AckHandle, bf.Data())
 }
@@ -1770,7 +1772,7 @@ func handleMsgMhfLoadGuildCooking(s *Session, p mhfpacket.MHFPacket) {
 		if err != nil {
 			continue
 		}
-		if temp.CreatedAt.Add(60 * time.Minute).After(TimeAdjusted()) {
+		if temp.CreatedAt.Add(60 * time.Minute).After(gametime.TimeAdjusted()) {
 			meals = append(meals, temp)
 		}
 	}
@@ -1788,7 +1790,7 @@ func handleMsgMhfLoadGuildCooking(s *Session, p mhfpacket.MHFPacket) {
 func handleMsgMhfRegistGuildCooking(s *Session, p mhfpacket.MHFPacket) {
 	pkt := p.(*mhfpacket.MsgMhfRegistGuildCooking)
 	guild, _ := GetGuildInfoByCharacterId(s, s.charID)
-	startTime := TimeAdjusted().Add(time.Duration(s.server.erupeConfig.GameplayOptions.ClanMealDuration-3600) * time.Second)
+	startTime := gametime.TimeAdjusted().Add(time.Duration(s.server.erupeConfig.GameplayOptions.ClanMealDuration-3600) * time.Second)
 	if pkt.OverwriteID != 0 {
 		s.server.db.Exec("UPDATE guild_meals SET meal_id = $1, level = $2, created_at = $3 WHERE id = $4", pkt.MealID, pkt.Success, startTime, pkt.OverwriteID)
 	} else {
@@ -1823,7 +1825,7 @@ func handleMsgMhfGuildHuntdata(s *Session, p mhfpacket.MHFPacket) {
 	bf := byteframe.NewByteFrame()
 	switch pkt.Operation {
 	case 0: // Acquire
-		s.server.db.Exec(`UPDATE guild_characters SET box_claimed=$1 WHERE character_id=$2`, TimeAdjusted(), s.charID)
+		s.server.db.Exec(`UPDATE guild_characters SET box_claimed=$1 WHERE character_id=$2`, gametime.TimeAdjusted(), s.charID)
 	case 1: // Enumerate
 		bf.WriteUint8(0) // Entries
 		rows, err := s.server.db.Query(`SELECT kl.id, kl.monster FROM kill_logs kl

server/channelserver/handlers_guild_adventure.go

@@ -3,9 +3,11 @@ package channelserver
 import (
 	"time"
 
-	"erupe-ce/common/byteframe"
-	"erupe-ce/common/stringsupport"
 	"erupe-ce/network/mhfpacket"
+	"erupe-ce/utils/byteframe"
+	"erupe-ce/utils/gametime"
+	"erupe-ce/utils/stringsupport"
+
 	"go.uber.org/zap"
 )
 
@@ -52,7 +54,7 @@ func handleMsgMhfLoadGuildAdventure(s *Session, p mhfpacket.MHFPacket) {
 func handleMsgMhfRegistGuildAdventure(s *Session, p mhfpacket.MHFPacket) {
 	pkt := p.(*mhfpacket.MsgMhfRegistGuildAdventure)
 	guild, _ := GetGuildInfoByCharacterId(s, s.charID)
-	_, err := s.server.db.Exec("INSERT INTO guild_adventures (guild_id, destination, depart, return) VALUES ($1, $2, $3, $4)", guild.ID, pkt.Destination, TimeAdjusted().Unix(), TimeAdjusted().Add(6*time.Hour).Unix())
+	_, err := s.server.db.Exec("INSERT INTO guild_adventures (guild_id, destination, depart, return) VALUES ($1, $2, $3, $4)", guild.ID, pkt.Destination, gametime.TimeAdjusted().Unix(), gametime.TimeAdjusted().Add(6*time.Hour).Unix())
 	if err != nil {
 		s.logger.Error("Failed to register guild adventure", zap.Error(err))
 	}
@@ -87,7 +89,7 @@ func handleMsgMhfChargeGuildAdventure(s *Session, p mhfpacket.MHFPacket) {
 func handleMsgMhfRegistGuildAdventureDiva(s *Session, p mhfpacket.MHFPacket) {
 	pkt := p.(*mhfpacket.MsgMhfRegistGuildAdventureDiva)
 	guild, _ := GetGuildInfoByCharacterId(s, s.charID)
-	_, err := s.server.db.Exec("INSERT INTO guild_adventures (guild_id, destination, charge, depart, return) VALUES ($1, $2, $3, $4, $5)", guild.ID, pkt.Destination, pkt.Charge, TimeAdjusted().Unix(), TimeAdjusted().Add(1*time.Hour).Unix())
+	_, err := s.server.db.Exec("INSERT INTO guild_adventures (guild_id, destination, charge, depart, return) VALUES ($1, $2, $3, $4, $5)", guild.ID, pkt.Destination, pkt.Charge, gametime.TimeAdjusted().Unix(), gametime.TimeAdjusted().Add(1*time.Hour).Unix())
 	if err != nil {
 		s.logger.Error("Failed to register guild adventure", zap.Error(err))
 	}

server/channelserver/handlers_guild_alliance.go

@@ -1,12 +1,13 @@
 package channelserver
 
 import (
-	"erupe-ce/common/byteframe"
-	ps "erupe-ce/common/pascalstring"
+	"erupe-ce/utils/byteframe"
+	ps "erupe-ce/utils/pascalstring"
 	"fmt"
 	"time"
 
 	"erupe-ce/network/mhfpacket"
+
 	"github.com/jmoiron/sqlx"
 	"go.uber.org/zap"
 )

server/channelserver/handlers_guild_scout.go

@@ -1,12 +1,14 @@
 package channelserver
 
 import (
-	"erupe-ce/common/byteframe"
-	"erupe-ce/common/stringsupport"
 	"erupe-ce/network/mhfpacket"
+	"erupe-ce/utils/byteframe"
+	"erupe-ce/utils/gametime"
+	"erupe-ce/utils/stringsupport"
 	"fmt"
-	"go.uber.org/zap"
 	"io"
+
+	"go.uber.org/zap"
 )
 
 func handleMsgMhfPostGuildScout(s *Session, p mhfpacket.MHFPacket) {
@@ -245,7 +247,7 @@ func handleMsgMhfGetGuildScoutList(s *Session, p mhfpacket.MHFPacket) {
 		bf.WriteUint32(charID)
 		bf.WriteUint32(actorID)
 		bf.WriteUint32(charID)
-		bf.WriteUint32(uint32(TimeAdjusted().Unix()))
+		bf.WriteUint32(uint32(gametime.TimeAdjusted().Unix()))
 		bf.WriteUint16(HR) // HR?
 		bf.WriteUint16(GR) // GR?
 		bf.WriteBytes(stringsupport.PaddedString(charName, 32, true))

server/channelserver/handlers_guild_tresure.go

@@ -1,9 +1,10 @@
 package channelserver
 
 import (
-	"erupe-ce/common/byteframe"
-	"erupe-ce/common/stringsupport"
 	"erupe-ce/network/mhfpacket"
+	"erupe-ce/utils/byteframe"
+	"erupe-ce/utils/gametime"
+	"erupe-ce/utils/stringsupport"
 	"time"
 )
 
@@ -54,7 +55,7 @@ func handleMsgMhfEnumerateGuildTresure(s *Session, p mhfpacket.MHFPacket) {
 		} else {
 			for rows.Next() {
 				err = rows.StructScan(&hunt)
-				if err == nil && hunt.Start.Add(time.Second*time.Duration(s.server.erupeConfig.GameplayOptions.TreasureHuntExpiry)).After(TimeAdjusted()) {
+				if err == nil && hunt.Start.Add(time.Second*time.Duration(s.server.erupeConfig.GameplayOptions.TreasureHuntExpiry)).After(gametime.TimeAdjusted()) {
 					hunts = append(hunts, hunt)
 				}
 			}

server/channelserver/handlers_house.go

@@ -1,17 +1,18 @@
 package channelserver
 
 import (
-	"erupe-ce/common/byteframe"
-	"erupe-ce/common/mhfitem"
-	ps "erupe-ce/common/pascalstring"
-	"erupe-ce/common/stringsupport"
-	"erupe-ce/common/token"
 	_config "erupe-ce/config"
 	"erupe-ce/network/mhfpacket"
+	"erupe-ce/utils/byteframe"
+	"erupe-ce/utils/mhfitem"
+	ps "erupe-ce/utils/pascalstring"
+	"erupe-ce/utils/stringsupport"
+	"erupe-ce/utils/token"
 	"fmt"
-	"go.uber.org/zap"
 	"io"
 	"time"
+
+	"go.uber.org/zap"
 )
 
 const warehouseNamesQuery = `

server/channelserver/handlers_kouryou.go

@@ -1,8 +1,9 @@
 package channelserver
 
 import (
-	"erupe-ce/common/byteframe"
 	"erupe-ce/network/mhfpacket"
+	"erupe-ce/utils/byteframe"
+
 	"go.uber.org/zap"
 )
 

server/channelserver/handlers_mail.go

@@ -2,12 +2,13 @@ package channelserver
 
 import (
 	"database/sql"
-	"erupe-ce/common/stringsupport"
+	"erupe-ce/utils/stringsupport"
 	"time"
 
-	"erupe-ce/common/byteframe"
 	"erupe-ce/network/binpacket"
 	"erupe-ce/network/mhfpacket"
+	"erupe-ce/utils/byteframe"
+
 	"go.uber.org/zap"
 )
 

server/channelserver/handlers_mercenary.go

@@ -1,15 +1,17 @@
 package channelserver
 
 import (
-	"erupe-ce/common/byteframe"
-	"erupe-ce/common/stringsupport"
 	_config "erupe-ce/config"
 	"erupe-ce/network/mhfpacket"
 	"erupe-ce/server/channelserver/compression/deltacomp"
 	"erupe-ce/server/channelserver/compression/nullcomp"
-	"go.uber.org/zap"
+	"erupe-ce/utils/byteframe"
+	"erupe-ce/utils/gametime"
+	"erupe-ce/utils/stringsupport"
 	"io"
 	"time"
+
+	"go.uber.org/zap"
 )
 
 func handleMsgMhfLoadPartner(s *Session, p mhfpacket.MHFPacket) {
@@ -40,9 +42,9 @@ func handleMsgMhfLoadLegendDispatch(s *Session, p mhfpacket.MHFPacket) {
 		Unk       uint32
 		Timestamp uint32
 	}{
-		{0, uint32(TimeMidnight().Add(-12 * time.Hour).Unix())},
-		{0, uint32(TimeMidnight().Add(12 * time.Hour).Unix())},
-		{0, uint32(TimeMidnight().Add(36 * time.Hour).Unix())},
+		{0, uint32(gametime.TimeMidnight().Add(-12 * time.Hour).Unix())},
+		{0, uint32(gametime.TimeMidnight().Add(12 * time.Hour).Unix())},
+		{0, uint32(gametime.TimeMidnight().Add(36 * time.Hour).Unix())},
 	}
 	bf.WriteUint8(uint8(len(legendDispatch)))
 	for _, dispatch := range legendDispatch {
@@ -167,8 +169,8 @@ func handleMsgMhfReadMercenaryW(s *Session, p mhfpacket.MHFPacket) {
 		bf.WriteUint32(pactID)
 		bf.WriteUint32(cid)
 		bf.WriteBool(true) // Escort enabled
-		bf.WriteUint32(uint32(TimeAdjusted().Unix()))
-		bf.WriteUint32(uint32(TimeAdjusted().Add(time.Hour * 24 * 7).Unix()))
+		bf.WriteUint32(uint32(gametime.TimeAdjusted().Unix()))
+		bf.WriteUint32(uint32(gametime.TimeAdjusted().Add(time.Hour * 24 * 7).Unix()))
 		bf.WriteBytes(stringsupport.PaddedString(name, 18, true))
 	} else {
 		bf.WriteUint8(0)
@@ -186,8 +188,8 @@ func handleMsgMhfReadMercenaryW(s *Session, p mhfpacket.MHFPacket) {
 			loans++
 			temp.WriteUint32(pactID)
 			temp.WriteUint32(cid)
-			temp.WriteUint32(uint32(TimeAdjusted().Unix()))
-			temp.WriteUint32(uint32(TimeAdjusted().Add(time.Hour * 24 * 7).Unix()))
+			temp.WriteUint32(uint32(gametime.TimeAdjusted().Unix()))
+			temp.WriteUint32(uint32(gametime.TimeAdjusted().Add(time.Hour * 24 * 7).Unix()))
 			temp.WriteBytes(stringsupport.PaddedString(name, 18, true))
 		}
 	}
@@ -345,7 +347,7 @@ func getGuildAirouList(s *Session) []Airou {
 		if err != nil {
 			continue
 		}
-		if startTemp.Add(time.Second * time.Duration(s.server.erupeConfig.GameplayOptions.TreasureHuntPartnyaCooldown)).Before(TimeAdjusted()) {
+		if startTemp.Add(time.Second * time.Duration(s.server.erupeConfig.GameplayOptions.TreasureHuntPartnyaCooldown)).Before(gametime.TimeAdjusted()) {
 			for i, j := range stringsupport.CSVElems(csvTemp) {
 				bannedCats[uint32(j)] = i
 			}

server/channelserver/handlers_object.go

@@ -3,8 +3,8 @@ package channelserver
 import (
 	"fmt"
 
-	"erupe-ce/common/byteframe"
 	"erupe-ce/network/mhfpacket"
+	"erupe-ce/utils/byteframe"
 )
 
 func handleMsgSysCreateObject(s *Session, p mhfpacket.MHFPacket) {

server/channelserver/handlers_quest.go

@@ -3,11 +3,13 @@ package channelserver
 import (
 	"database/sql"
 	"encoding/binary"
-	"erupe-ce/common/byteframe"
-	"erupe-ce/common/decryption"
-	ps "erupe-ce/common/pascalstring"
+	"erupe-ce/utils/byteframe"
+	"erupe-ce/utils/decryption"
+	"erupe-ce/utils/gametime"
+
 	_config "erupe-ce/config"
 	"erupe-ce/network/mhfpacket"
+	ps "erupe-ce/utils/pascalstring"
 	"fmt"
 	"io"
 	"os"
@@ -153,7 +155,7 @@ func seasonConversion(s *Session, questFile string) string {
 		// Since event quests when seasonal pick day or night and the client requests either one, we need to differentiate between the two to prevent issues.
 		var _time string
 
-		if TimeGameAbsolute() > 2880 {
+		if gametime.TimeGameAbsolute() > 2880 {
 			_time = "d"
 		} else {
 			_time = "n"
@@ -354,7 +356,7 @@ func handleMsgMhfEnumerateQuest(s *Session, p mhfpacket.MHFPacket) {
 					rotationTime := startTime.Add(time.Duration(activeDays+inactiveDays) * 24 * time.Hour * time.Duration(extraCycles))
 					if currentTime.After(rotationTime) {
 						// Normalize rotationTime to 12PM JST to align with the in-game events update notification.
-						newRotationTime := time.Date(rotationTime.Year(), rotationTime.Month(), rotationTime.Day(), 12, 0, 0, 0, TimeAdjusted().Location())
+						newRotationTime := time.Date(rotationTime.Year(), rotationTime.Month(), rotationTime.Day(), 12, 0, 0, 0, gametime.TimeAdjusted().Location())
 
 						_, err = tx.Exec("UPDATE event_quests SET start_time = $1 WHERE id = $2", newRotationTime, id)
 						if err != nil {

server/channelserver/handlers_register.go

@@ -1,8 +1,8 @@
 package channelserver
 
 import (
-	"erupe-ce/common/byteframe"
 	"erupe-ce/network/mhfpacket"
+	"erupe-ce/utils/byteframe"
 	"strings"
 )
 

server/channelserver/handlers_rengoku.go

@@ -1,14 +1,16 @@
 package channelserver
 
 import (
-	ps "erupe-ce/common/pascalstring"
+	ps "erupe-ce/utils/pascalstring"
 	"fmt"
-	"github.com/jmoiron/sqlx"
 	"os"
 	"path/filepath"
 
-	"erupe-ce/common/byteframe"
+	"github.com/jmoiron/sqlx"
+
 	"erupe-ce/network/mhfpacket"
+	"erupe-ce/utils/byteframe"
+
 	"go.uber.org/zap"
 )
 

server/channelserver/handlers_reward.go

@@ -3,8 +3,8 @@ package channelserver
 import (
 	"encoding/hex"
 
-	"erupe-ce/common/byteframe"
 	"erupe-ce/network/mhfpacket"
+	"erupe-ce/utils/byteframe"
 )
 
 func handleMsgMhfGetAdditionalBeatReward(s *Session, p mhfpacket.MHFPacket) {

server/channelserver/handlers_seibattle.go

@@ -1,8 +1,8 @@
 package channelserver
 
 import (
-	"erupe-ce/common/byteframe"
 	"erupe-ce/network/mhfpacket"
+	"erupe-ce/utils/byteframe"
 )
 
 func handleMsgMhfGetBreakSeibatuLevelReward(s *Session, p mhfpacket.MHFPacket) {

server/channelserver/handlers_semaphore.go

@@ -1,11 +1,12 @@
 package channelserver
 
 import (
-	"erupe-ce/common/byteframe"
-	"go.uber.org/zap"
+	"erupe-ce/utils/byteframe"
 	"strconv"
 	"strings"
 
+	"go.uber.org/zap"
+
 	"erupe-ce/network/mhfpacket"
 )
 

server/channelserver/handlers_shop_gacha.go

@@ -1,10 +1,11 @@
 package channelserver
 
 import (
-	"erupe-ce/common/byteframe"
-	ps "erupe-ce/common/pascalstring"
 	_config "erupe-ce/config"
 	"erupe-ce/network/mhfpacket"
+	"erupe-ce/utils/byteframe"
+	"erupe-ce/utils/gametime"
+	ps "erupe-ce/utils/pascalstring"
 	"math/rand"
 )
 
@@ -574,7 +575,7 @@ func handleMsgMhfGetStepupStatus(s *Session, p mhfpacket.MHFPacket) {
 	}
 	bf := byteframe.NewByteFrame()
 	bf.WriteUint8(step)
-	bf.WriteUint32(uint32(TimeAdjusted().Unix()))
+	bf.WriteUint32(uint32(gametime.TimeAdjusted().Unix()))
 	doAckBufSucceed(s, pkt.AckHandle, bf.Data())
 }
 

server/channelserver/handlers_stage.go

@@ -5,9 +5,10 @@ import (
 	"strings"
 	"time"
 
-	"erupe-ce/common/byteframe"
-	ps "erupe-ce/common/pascalstring"
 	"erupe-ce/network/mhfpacket"
+	"erupe-ce/utils/byteframe"
+	ps "erupe-ce/utils/pascalstring"
+
 	"go.uber.org/zap"
 )
 

server/channelserver/handlers_tactics.go

@@ -2,8 +2,8 @@ package channelserver
 
 import (
 	"encoding/hex"
-	"erupe-ce/common/byteframe"
 	"erupe-ce/network/mhfpacket"
+	"erupe-ce/utils/byteframe"
 )
 
 func handleMsgMhfGetUdTacticsPoint(s *Session, p mhfpacket.MHFPacket) {

server/channelserver/handlers_tournament.go

@@ -1,9 +1,10 @@
 package channelserver
 
 import (
-	"erupe-ce/common/byteframe"
-	ps "erupe-ce/common/pascalstring"
 	"erupe-ce/network/mhfpacket"
+	"erupe-ce/utils/byteframe"
+	"erupe-ce/utils/gametime"
+	ps "erupe-ce/utils/pascalstring"
 	"time"
 )
 
@@ -76,7 +77,7 @@ func handleMsgMhfInfoTournament(s *Session, p mhfpacket.MHFPacket) {
 			ps.Uint16(bf, tinfo.Unk6, true)
 		}
 	case 1:
-		bf.WriteUint32(uint32(TimeAdjusted().Unix()))
+		bf.WriteUint32(uint32(gametime.TimeAdjusted().Unix()))
 		bf.WriteUint32(0) // Registered ID
 		bf.WriteUint32(0)
 		bf.WriteUint32(0)

server/channelserver/handlers_tower.go

@@ -3,13 +3,14 @@ package channelserver
 import (
 	_config "erupe-ce/config"
 	"fmt"
-	"go.uber.org/zap"
 	"strings"
 	"time"
 
-	"erupe-ce/common/byteframe"
-	"erupe-ce/common/stringsupport"
+	"go.uber.org/zap"
+
 	"erupe-ce/network/mhfpacket"
+	"erupe-ce/utils/byteframe"
+	"erupe-ce/utils/stringsupport"
 )
 
 type TowerInfoTRP struct {

server/channelserver/sys_channel_server.go

@@ -7,12 +7,13 @@ import (
 	"sync"
 	"time"
 
-	"erupe-ce/common/byteframe"
-	ps "erupe-ce/common/pascalstring"
 	_config "erupe-ce/config"
 	"erupe-ce/network/binpacket"
 	"erupe-ce/network/mhfpacket"
 	"erupe-ce/server/discordbot"
+	"erupe-ce/utils/byteframe"
+	"erupe-ce/utils/gametime"
+	ps "erupe-ce/utils/pascalstring"
 
 	"github.com/jmoiron/sqlx"
 	"go.uber.org/zap"
@@ -435,5 +436,5 @@ func (s *Server) HasSemaphore(ses *Session) bool {
 
 func (s *Server) Season() uint8 {
 	sid := int64(((s.ID & 0xFF00) - 4096) / 256)
-	return uint8(((TimeAdjusted().Unix() / 86400) + sid) % 3)
+	return uint8(((gametime.TimeAdjusted().Unix() / 86400) + sid) % 3)
 }

server/channelserver/sys_semaphore.go

@@ -1,8 +1,8 @@
 package channelserver
 
 import (
-	"erupe-ce/common/byteframe"
 	"erupe-ce/network/mhfpacket"
+	"erupe-ce/utils/byteframe"
 
 	"sync"
 )

server/channelserver/sys_session.go

@@ -3,19 +3,20 @@ package channelserver
 import (
 	"encoding/binary"
 	"encoding/hex"
-	"erupe-ce/common/mhfcourse"
 	_config "erupe-ce/config"
+	"erupe-ce/utils/gametime"
+	"erupe-ce/utils/mhfcourse"
 	"fmt"
 	"io"
 	"net"
 	"sync"
 	"time"
 
-	"erupe-ce/common/byteframe"
-	"erupe-ce/common/stringstack"
 	"erupe-ce/network"
 	"erupe-ce/network/clientctx"
 	"erupe-ce/network/mhfpacket"
+	"erupe-ce/utils/byteframe"
+	"erupe-ce/utils/stringstack"
 
 	"go.uber.org/zap"
 )
@@ -80,7 +81,7 @@ func NewSession(server *Server, conn net.Conn) *Session {
 		sendPackets:    make(chan packet, 20),
 		clientContext:  &clientctx.ClientContext{}, // Unused
 		lastPacket:     time.Now(),
-		sessionStart:   TimeAdjusted().Unix(),
+		sessionStart:   gametime.TimeAdjusted().Unix(),
 		stageMoveStack: stringstack.New(),
 		ackStart:       make(map[uint32]time.Time),
 		semaphoreID:    make([]uint16, 2),

server/channelserver/sys_stage.go

@@ -3,8 +3,8 @@ package channelserver
 import (
 	"sync"
 
-	"erupe-ce/common/byteframe"
 	"erupe-ce/network/mhfpacket"
+	"erupe-ce/utils/byteframe"
 )
 
 // Object holds infomation about a specific object.

server/channelserver/sys_time.go

@@ -1,32 +0,0 @@
-package channelserver
-
-import (
-	"time"
-)
-
-func TimeAdjusted() time.Time {
-	baseTime := time.Now().In(time.FixedZone("UTC+9", 9*60*60))
-	return time.Date(baseTime.Year(), baseTime.Month(), baseTime.Day(), baseTime.Hour(), baseTime.Minute(), baseTime.Second(), baseTime.Nanosecond(), baseTime.Location())
-}
-
-func TimeMidnight() time.Time {
-	baseTime := time.Now().In(time.FixedZone("UTC+9", 9*60*60))
-	return time.Date(baseTime.Year(), baseTime.Month(), baseTime.Day(), 0, 0, 0, 0, baseTime.Location())
-}
-
-func TimeWeekStart() time.Time {
-	midnight := TimeMidnight()
-	offset := int(midnight.Weekday()) - int(time.Monday)
-	if offset < 0 {
-		offset += 7
-	}
-	return midnight.Add(-time.Duration(offset) * 24 * time.Hour)
-}
-
-func TimeWeekNext() time.Time {
-	return TimeWeekStart().Add(time.Hour * 24 * 7)
-}
-
-func TimeGameAbsolute() uint32 {
-	return uint32((TimeAdjusted().Unix() - 2160) % 5760)
-}

server/entranceserver/make_resp.go

@@ -3,13 +3,13 @@ package entranceserver
 import (
 	"encoding/binary"
 	"encoding/hex"
-	"erupe-ce/common/stringsupport"
 	_config "erupe-ce/config"
+	"erupe-ce/utils/gametime"
+	"erupe-ce/utils/stringsupport"
 	"fmt"
 	"net"
 
-	"erupe-ce/common/byteframe"
-	"erupe-ce/server/channelserver"
+	"erupe-ce/utils/byteframe"
 )
 
 func encodeServerInfo(config *_config.Config, s *Server, local bool) []byte {
@@ -41,7 +41,7 @@ func encodeServerInfo(config *_config.Config, s *Server, local bool) []byte {
 		bf.WriteUint16(0)
 		bf.WriteUint16(uint16(len(si.Channels)))
 		bf.WriteUint8(si.Type)
-		bf.WriteUint8(uint8(((channelserver.TimeAdjusted().Unix() / 86400) + int64(serverIdx)) % 3))
+		bf.WriteUint8(uint8(((gametime.TimeAdjusted().Unix() / 86400) + int64(serverIdx)) % 3))
 		if s.erupeConfig.RealClientMode >= _config.G1 {
 			bf.WriteUint8(si.Recommended)
 		}
@@ -85,7 +85,7 @@ func encodeServerInfo(config *_config.Config, s *Server, local bool) []byte {
 			bf.WriteUint16(12345)
 		}
 	}
-	bf.WriteUint32(uint32(channelserver.TimeAdjusted().Unix()))
+	bf.WriteUint32(uint32(gametime.TimeAdjusted().Unix()))
 	bf.WriteUint32(uint32(s.erupeConfig.GameplayOptions.ClanMemberLimits[len(s.erupeConfig.GameplayOptions.ClanMemberLimits)-1][1]))
 	return bf.Data()
 }

server/signserver/dbutils.go

@@ -3,8 +3,8 @@ package signserver
 import (
 	"database/sql"
 	"errors"
-	"erupe-ce/common/mhfcourse"
-	"erupe-ce/common/token"
+	"erupe-ce/utils/mhfcourse"
+	"erupe-ce/utils/token"
 	"strings"
 	"time"
 

server/signserver/dsgn_resp.go

@@ -1,11 +1,12 @@
 package signserver
 
 import (
-	"erupe-ce/common/byteframe"
-	ps "erupe-ce/common/pascalstring"
-	"erupe-ce/common/stringsupport"
+	"erupe-ce/utils/byteframe"
+	"erupe-ce/utils/gametime"
+	ps "erupe-ce/utils/pascalstring"
+	"erupe-ce/utils/stringsupport"
+
 	_config "erupe-ce/config"
-	"erupe-ce/server/channelserver"
 	"fmt"
 	"strings"
 	"time"
@@ -50,7 +51,7 @@ func (s *Session) makeSignResponse(uid uint32) []byte {
 	bf.WriteUint8(uint8(len(chars)))
 	bf.WriteUint32(tokenID)
 	bf.WriteBytes([]byte(sessToken))
-	bf.WriteUint32(uint32(channelserver.TimeAdjusted().Unix()))
+	bf.WriteUint32(uint32(gametime.TimeAdjusted().Unix()))
 	if s.client == PS3 {
 		ps.Uint8(bf, fmt.Sprintf("%s/ps3", s.server.erupeConfig.PatchServerManifest), false)
 		ps.Uint8(bf, fmt.Sprintf("%s/ps3", s.server.erupeConfig.PatchServerFile), false)
@@ -378,11 +379,11 @@ func (s *Session) makeSignResponse(uid uint32) []byte {
 	}
 
 	// We can just use the start timestamp as the event ID
-	bf.WriteUint32(uint32(channelserver.TimeWeekStart().Unix()))
+	bf.WriteUint32(uint32(gametime.TimeWeekStart().Unix()))
 	// Start time
-	bf.WriteUint32(uint32(channelserver.TimeWeekNext().Add(-time.Duration(s.server.erupeConfig.GameplayOptions.MezFesDuration) * time.Second).Unix()))
+	bf.WriteUint32(uint32(gametime.TimeWeekNext().Add(-time.Duration(s.server.erupeConfig.GameplayOptions.MezFesDuration) * time.Second).Unix()))
 	// End time
-	bf.WriteUint32(uint32(channelserver.TimeWeekNext().Unix()))
+	bf.WriteUint32(uint32(gametime.TimeWeekNext().Unix()))
 	bf.WriteUint8(uint8(len(tickets)))
 	for i := range tickets {
 		bf.WriteUint32(tickets[i])

server/signserver/session.go

@@ -3,14 +3,14 @@ package signserver
 import (
 	"database/sql"
 	"encoding/hex"
-	"erupe-ce/common/stringsupport"
+	"erupe-ce/utils/stringsupport"
 	"fmt"
 	"net"
 	"strings"
 	"sync"
 
-	"erupe-ce/common/byteframe"
 	"erupe-ce/network"
+	"erupe-ce/utils/byteframe"
 
 	"go.uber.org/zap"
 )