[M] Move package name

planet/src/main/kotlin/aquadx/Entry.kt

@@ -1,7 +1,7 @@
-package icu.samnyan.aqua
+package aquadx
 
-import icu.samnyan.aqua.sega.aimedb.AimeDbServer
-import icu.samnyan.aqua.spring.AutoChecker
+import aquadx.sega.aimedb.AimeDbServer
+import aquadx.spring.AutoChecker
 import org.springframework.boot.SpringApplication
 import org.springframework.boot.ansi.AnsiOutput
 import org.springframework.boot.autoconfigure.SpringBootApplication

planet/src/main/kotlin/aquadx/net/Bot.kt

@@ -1,13 +1,13 @@
-package icu.samnyan.aqua.net
+package aquadx.net
 
 import ext.*
-import icu.samnyan.aqua.net.db.AquaUserServices
-import icu.samnyan.aqua.net.utils.SUCCESS
-import icu.samnyan.aqua.sega.chusan.model.Chu3Repos
-import icu.samnyan.aqua.sega.general.model.Card
-import icu.samnyan.aqua.sega.general.model.CardStatus
-import icu.samnyan.aqua.sega.general.model.sensitiveInfo
-import icu.samnyan.aqua.sega.maimai2.model.Mai2Repos
+import aquadx.net.db.AquaUserServices
+import aquadx.net.utils.SUCCESS
+import aquadx.sega.chusan.model.Chu3Repos
+import aquadx.sega.general.model.Card
+import aquadx.sega.general.model.CardStatus
+import aquadx.sega.general.model.sensitiveInfo
+import aquadx.sega.maimai2.model.Mai2Repos
 import jakarta.transaction.Transactional
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
 import org.springframework.boot.context.properties.ConfigurationProperties

planet/src/main/kotlin/aquadx/net/CardController.kt

@@ -1,20 +1,20 @@
-package icu.samnyan.aqua.net
+package aquadx.net
 
 import ext.*
-import icu.samnyan.aqua.net.components.JWT
-import icu.samnyan.aqua.net.db.AquaUserServices
-import icu.samnyan.aqua.net.games.GenericUserDataRepo
-import icu.samnyan.aqua.net.games.IUserData
-import icu.samnyan.aqua.net.utils.AquaNetProps
-import icu.samnyan.aqua.net.utils.SUCCESS
-import icu.samnyan.aqua.sega.chusan.model.Chu3UserDataRepo
-import icu.samnyan.aqua.sega.diva.PlayerProfileRepository
-import icu.samnyan.aqua.sega.general.dao.CardRepository
-import icu.samnyan.aqua.sega.general.model.Card
-import icu.samnyan.aqua.sega.general.service.CardService
-import icu.samnyan.aqua.sega.maimai2.model.Mai2UserDataRepo
-import icu.samnyan.aqua.sega.ongeki.OgkUserDataRepo
-import icu.samnyan.aqua.sega.wacca.model.db.WcUserRepo
+import aquadx.net.components.JWT
+import aquadx.net.db.AquaUserServices
+import aquadx.net.games.GenericUserDataRepo
+import aquadx.net.games.IUserData
+import aquadx.net.utils.AquaNetProps
+import aquadx.net.utils.SUCCESS
+import aquadx.sega.chusan.model.Chu3UserDataRepo
+import aquadx.sega.diva.PlayerProfileRepository
+import aquadx.sega.general.dao.CardRepository
+import aquadx.sega.general.model.Card
+import aquadx.sega.general.service.CardService
+import aquadx.sega.maimai2.model.Mai2UserDataRepo
+import aquadx.sega.ongeki.OgkUserDataRepo
+import aquadx.sega.wacca.model.db.WcUserRepo
 import jakarta.persistence.EntityManager
 import org.springframework.scheduling.annotation.Scheduled
 import org.springframework.stereotype.Service

planet/src/main/kotlin/aquadx/net/Fedy.kt

@@ -1,25 +1,25 @@
-package icu.samnyan.aqua.net
+package aquadx.net
 
 import ext.*
-import icu.samnyan.aqua.net.components.EmailProperties
-import icu.samnyan.aqua.net.components.JWT
-import icu.samnyan.aqua.net.db.AquaGameOptions
-import icu.samnyan.aqua.net.db.AquaNetUser
-import icu.samnyan.aqua.net.db.AquaUserServices
-import icu.samnyan.aqua.net.games.ExportOptions
-import icu.samnyan.aqua.net.games.GenericUserDataRepo
-import icu.samnyan.aqua.net.games.IUserData
-import icu.samnyan.aqua.net.games.mai2.Mai2Import
-import icu.samnyan.aqua.net.utils.ApiException
-import icu.samnyan.aqua.net.utils.PathProps
-import icu.samnyan.aqua.net.utils.SUCCESS
-import icu.samnyan.aqua.sega.chusan.model.Chu3UserDataRepo
-import icu.samnyan.aqua.sega.general.dao.CardRepository
-import icu.samnyan.aqua.sega.general.model.Card
-import icu.samnyan.aqua.sega.general.service.CardService
-import icu.samnyan.aqua.sega.maimai2.model.Mai2UserDataRepo
-import icu.samnyan.aqua.sega.ongeki.OgkUserDataRepo
-import icu.samnyan.aqua.sega.wacca.model.db.WcUserRepo
+import aquadx.net.components.EmailProperties
+import aquadx.net.components.JWT
+import aquadx.net.db.AquaGameOptions
+import aquadx.net.db.AquaNetUser
+import aquadx.net.db.AquaUserServices
+import aquadx.net.games.ExportOptions
+import aquadx.net.games.GenericUserDataRepo
+import aquadx.net.games.IUserData
+import aquadx.net.games.mai2.Mai2Import
+import aquadx.net.utils.ApiException
+import aquadx.net.utils.PathProps
+import aquadx.net.utils.SUCCESS
+import aquadx.sega.chusan.model.Chu3UserDataRepo
+import aquadx.sega.general.dao.CardRepository
+import aquadx.sega.general.model.Card
+import aquadx.sega.general.service.CardService
+import aquadx.sega.maimai2.model.Mai2UserDataRepo
+import aquadx.sega.ongeki.OgkUserDataRepo
+import aquadx.sega.wacca.model.db.WcUserRepo
 import org.springframework.boot.context.properties.ConfigurationProperties
 import org.springframework.context.annotation.Configuration
 import org.springframework.transaction.PlatformTransactionManager
@@ -33,8 +33,8 @@ import java.util.concurrent.CompletableFuture
 import kotlin.io.path.getLastModifiedTime
 import kotlin.io.path.isRegularFile
 import kotlin.io.path.writeBytes
-import icu.samnyan.aqua.sega.maimai2.handler.UploadUserPlaylogHandler as Mai2UploadUserPlaylogHandler
-import icu.samnyan.aqua.sega.maimai2.handler.UpsertUserAllHandler as Mai2UpsertUserAllHandler
+import aquadx.sega.maimai2.handler.UploadUserPlaylogHandler as Mai2UploadUserPlaylogHandler
+import aquadx.sega.maimai2.handler.UpsertUserAllHandler as Mai2UpsertUserAllHandler
 
 @Configuration
 @ConfigurationProperties(prefix = "aqua-net.fedy")

planet/src/main/kotlin/aquadx/net/Frontier.kt

@@ -1,7 +1,7 @@
-package icu.samnyan.aqua.net
+package aquadx.net
 
 import ext.*
-import icu.samnyan.aqua.sega.general.service.CardService
+import aquadx.sega.general.service.CardService
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
 import org.springframework.boot.context.properties.ConfigurationProperties
 import org.springframework.context.annotation.Configuration

planet/src/main/kotlin/aquadx/net/Migrations.kt

@@ -1,12 +1,12 @@
-package icu.samnyan.aqua.net
+package aquadx.net
 
 import ext.JACKSON
 import ext.logger
 import ext.parse
-import icu.samnyan.aqua.net.db.AquaNetUserRepo
-import icu.samnyan.aqua.sega.general.dao.CardRepository
-import icu.samnyan.aqua.sega.general.dao.PropertyEntryRepository
-import icu.samnyan.aqua.sega.general.model.PropertyEntry
+import aquadx.net.db.AquaNetUserRepo
+import aquadx.sega.general.dao.CardRepository
+import aquadx.sega.general.dao.PropertyEntryRepository
+import aquadx.sega.general.model.PropertyEntry
 import jakarta.annotation.PostConstruct
 import org.springframework.stereotype.Service
 

planet/src/main/kotlin/aquadx/net/Safety.kt

@@ -1,4 +1,4 @@
-package icu.samnyan.aqua.net
+package aquadx.net
 
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.stereotype.Repository

planet/src/main/kotlin/aquadx/net/SettingsApi.kt

@@ -1,10 +1,10 @@
-package icu.samnyan.aqua.net
+package aquadx.net
 
 import ext.*
-import icu.samnyan.aqua.net.db.AquaGameOptions
-import icu.samnyan.aqua.net.db.AquaGameOptionsRepo
-import icu.samnyan.aqua.net.db.AquaNetUserRepo
-import icu.samnyan.aqua.net.db.AquaUserServices
+import aquadx.net.db.AquaGameOptions
+import aquadx.net.db.AquaGameOptionsRepo
+import aquadx.net.db.AquaNetUserRepo
+import aquadx.net.db.AquaUserServices
 import org.springframework.web.bind.annotation.RestController
 import kotlin.reflect.full.findAnnotation
 import kotlin.reflect.jvm.jvmErasure

planet/src/main/kotlin/aquadx/net/UserRegistrar.kt

@@ -1,15 +1,15 @@
-package icu.samnyan.aqua.net
+package aquadx.net
 
 import ext.*
-import icu.samnyan.aqua.net.components.*
-import icu.samnyan.aqua.net.db.AquaNetUserRepo
-import icu.samnyan.aqua.net.db.AquaUserServices
-import icu.samnyan.aqua.net.db.EmailConfirmationRepo
-import icu.samnyan.aqua.net.db.ResetPasswordRepo
-import icu.samnyan.aqua.net.utils.PathProps
-import icu.samnyan.aqua.net.utils.SUCCESS
-import icu.samnyan.aqua.sega.general.dao.CardRepository
-import icu.samnyan.aqua.sega.general.model.CardStatus
+import aquadx.net.components.*
+import aquadx.net.db.AquaNetUserRepo
+import aquadx.net.db.AquaUserServices
+import aquadx.net.db.EmailConfirmationRepo
+import aquadx.net.db.ResetPasswordRepo
+import aquadx.net.utils.PathProps
+import aquadx.net.utils.SUCCESS
+import aquadx.sega.general.dao.CardRepository
+import aquadx.sega.general.model.CardStatus
 import jakarta.servlet.http.HttpServletRequest
 import org.slf4j.LoggerFactory
 import org.springframework.security.crypto.password.PasswordEncoder

planet/src/main/kotlin/aquadx/net/components/Email.kt

@@ -1,9 +1,9 @@
-package icu.samnyan.aqua.net.components
+package aquadx.net.components
 
 import ext.Bool
 import ext.Str
 import ext.logger
-import icu.samnyan.aqua.net.db.*
+import aquadx.net.db.*
 import org.simplejavamail.api.mailer.Mailer
 import org.simplejavamail.email.EmailBuilder
 import org.simplejavamail.springsupport.SimpleJavaMailSpringSupport

planet/src/main/kotlin/aquadx/net/components/GeoIP.kt

@@ -1,4 +1,4 @@
-package icu.samnyan.aqua.net.components
+package aquadx.net.components
 
 import com.maxmind.geoip2.DatabaseReader
 import com.maxmind.geoip2.exception.AddressNotFoundException

planet/src/main/kotlin/aquadx/net/components/JWT.kt

@@ -1,8 +1,8 @@
-package icu.samnyan.aqua.net.components
+package aquadx.net.components
 
 import ext.Str
 import ext.minus
-import icu.samnyan.aqua.net.db.*
+import aquadx.net.db.*
 import io.jsonwebtoken.JwtParser
 import io.jsonwebtoken.Jwts
 import io.jsonwebtoken.security.Keys

planet/src/main/kotlin/aquadx/net/components/Turnstile.kt

@@ -1,4 +1,4 @@
-package icu.samnyan.aqua.net.components
+package aquadx.net.components
 
 import ext.Bool
 import ext.HTTP

planet/src/main/kotlin/aquadx/net/db/AquaEmailConfirmation.kt

@@ -1,4 +1,4 @@
-package icu.samnyan.aqua.net.db
+package aquadx.net.db
 
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.stereotype.Repository

planet/src/main/kotlin/aquadx/net/db/AquaEmailResetPassword.kt

@@ -1,4 +1,4 @@
-package icu.samnyan.aqua.net.db
+package aquadx.net.db
 
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.stereotype.Repository

planet/src/main/kotlin/aquadx/net/db/AquaGameOptions.kt

@@ -1,4 +1,4 @@
-package icu.samnyan.aqua.net.db
+package aquadx.net.db
 
 import org.springframework.data.jpa.repository.JpaRepository
 

planet/src/main/kotlin/aquadx/net/db/AquaNetSession.kt

@@ -1,4 +1,4 @@
-package icu.samnyan.aqua.net.db
+package aquadx.net.db
 
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.stereotype.Repository

planet/src/main/kotlin/aquadx/net/db/AquaNetUser.kt

@@ -1,22 +1,20 @@
-package icu.samnyan.aqua.net.db
+package aquadx.net.db
 
 import ext.*
-import icu.samnyan.aqua.net.UserRegistrar.Companion.cardExtIdEnd
-import icu.samnyan.aqua.net.UserRegistrar.Companion.cardExtIdStart
-import icu.samnyan.aqua.net.components.JWT
-import icu.samnyan.aqua.sega.allnet.AllNetProps
-import icu.samnyan.aqua.sega.allnet.KeyChipRepo
-import icu.samnyan.aqua.sega.allnet.KeychipSession
-import icu.samnyan.aqua.sega.general.GameMusicPopularity
-import icu.samnyan.aqua.sega.general.dao.CardRepository
-import icu.samnyan.aqua.sega.general.model.Card
-import icu.samnyan.aqua.sega.general.service.CardService
+import aquadx.net.UserRegistrar.Companion.cardExtIdEnd
+import aquadx.net.UserRegistrar.Companion.cardExtIdStart
+import aquadx.net.components.JWT
+import aquadx.sega.allnet.AllNetProps
+import aquadx.sega.allnet.KeyChipRepo
+import aquadx.sega.general.GameMusicPopularity
+import aquadx.sega.general.dao.CardRepository
+import aquadx.sega.general.model.Card
+import aquadx.sega.general.service.CardService
 import jakarta.persistence.*
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.security.crypto.password.PasswordEncoder
 import org.springframework.stereotype.Service
 import java.time.LocalDateTime
-import kotlin.reflect.KFunction
 import kotlin.reflect.KMutableProperty
 import kotlin.reflect.full.functions
 

planet/src/main/kotlin/aquadx/net/games/GameApiController.kt

@@ -1,11 +1,11 @@
-package icu.samnyan.aqua.net.games
+package aquadx.net.games
 
 import ext.*
-import icu.samnyan.aqua.net.BotProps
-import icu.samnyan.aqua.net.db.AquaUserServices
-import icu.samnyan.aqua.net.utils.SUCCESS
-import icu.samnyan.aqua.sega.general.model.Card
-import icu.samnyan.aqua.sega.general.service.CardService
+import aquadx.net.BotProps
+import aquadx.net.db.AquaUserServices
+import aquadx.net.utils.SUCCESS
+import aquadx.sega.general.model.Card
+import aquadx.sega.general.service.CardService
 import jakarta.annotation.PostConstruct
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired

planet/src/main/kotlin/aquadx/net/games/GameHelper.kt

@@ -1,4 +1,4 @@
-package icu.samnyan.aqua.net.games
+package aquadx.net.games
 
 import ext.isoDate
 import ext.minus

planet/src/main/kotlin/aquadx/net/games/ImportController.kt

@@ -1,13 +1,13 @@
-package icu.samnyan.aqua.net.games
+package aquadx.net.games
 
 import ext.*
-import icu.samnyan.aqua.net.Fedy
-import icu.samnyan.aqua.net.db.AquaNetUser
-import icu.samnyan.aqua.net.db.AquaUserServices
-import icu.samnyan.aqua.net.utils.AquaNetProps
-import icu.samnyan.aqua.net.utils.SUCCESS
-import icu.samnyan.aqua.sega.general.model.Card
-import icu.samnyan.aqua.sega.general.service.CardService
+import aquadx.net.Fedy
+import aquadx.net.db.AquaNetUser
+import aquadx.net.db.AquaUserServices
+import aquadx.net.utils.AquaNetProps
+import aquadx.net.utils.SUCCESS
+import aquadx.sega.general.model.Card
+import aquadx.sega.general.service.CardService
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.annotation.Lazy
 import org.springframework.data.jpa.repository.JpaRepository

planet/src/main/kotlin/aquadx/net/games/ImportHelper.kt

@@ -1,4 +1,4 @@
-package icu.samnyan.aqua.net.games
+package aquadx.net.games
 
 import com.fasterxml.jackson.core.JsonParser
 import com.fasterxml.jackson.databind.DeserializationContext

planet/src/main/kotlin/aquadx/net/games/Models.kt

@@ -1,6 +1,6 @@
-package icu.samnyan.aqua.net.games
+package aquadx.net.games
 
-import icu.samnyan.aqua.sega.general.model.Card
+import aquadx.sega.general.model.Card
 import org.springframework.data.domain.Page
 import org.springframework.data.domain.Pageable
 import org.springframework.data.jpa.repository.JpaRepository

planet/src/main/kotlin/aquadx/net/games/chu3/Chu3Import.kt

@@ -1,14 +1,14 @@
-package icu.samnyan.aqua.net.games.chu3
+package aquadx.net.games.chu3
 
 import ext.API
 import ext.returns
 import ext.vars
-import icu.samnyan.aqua.net.games.IExportClass
-import icu.samnyan.aqua.net.games.ImportClass
-import icu.samnyan.aqua.net.games.ImportController
-import icu.samnyan.aqua.sega.chusan.model.Chu3Repos
-import icu.samnyan.aqua.sega.chusan.model.Chu3UserLinked
-import icu.samnyan.aqua.sega.chusan.model.userdata.*
+import aquadx.net.games.IExportClass
+import aquadx.net.games.ImportClass
+import aquadx.net.games.ImportController
+import aquadx.sega.chusan.model.Chu3Repos
+import aquadx.sega.chusan.model.Chu3UserLinked
+import aquadx.sega.chusan.model.userdata.*
 import org.springframework.web.bind.annotation.RestController
 import kotlin.reflect.full.declaredMembers
 

planet/src/main/kotlin/aquadx/net/games/chu3/Chusan.kt

@@ -1,15 +1,15 @@
-package icu.samnyan.aqua.net.games.chu3
+package aquadx.net.games.chu3
 
 import ext.*
-import icu.samnyan.aqua.net.db.AquaUserServices
-import icu.samnyan.aqua.net.games.*
-import icu.samnyan.aqua.net.utils.chu3Scores
-import icu.samnyan.aqua.sega.chusan.model.Chu3Repos
-import icu.samnyan.aqua.sega.chusan.model.Chu3UserDataRepo
-import icu.samnyan.aqua.sega.chusan.model.Chu3UserMusicDetailRepo
-import icu.samnyan.aqua.sega.chusan.model.Chu3UserPlaylogRepo
-import icu.samnyan.aqua.sega.chusan.model.userdata.Chu3UserData
-import icu.samnyan.aqua.sega.chusan.model.userdata.UserGameOption
+import aquadx.net.db.AquaUserServices
+import aquadx.net.games.*
+import aquadx.net.utils.chu3Scores
+import aquadx.sega.chusan.model.Chu3Repos
+import aquadx.sega.chusan.model.Chu3UserDataRepo
+import aquadx.sega.chusan.model.Chu3UserMusicDetailRepo
+import aquadx.sega.chusan.model.Chu3UserPlaylogRepo
+import aquadx.sega.chusan.model.userdata.Chu3UserData
+import aquadx.sega.chusan.model.userdata.UserGameOption
 import org.springframework.web.bind.annotation.RestController
 import kotlin.jvm.optionals.getOrNull
 import kotlin.reflect.KMutableProperty1

planet/src/main/kotlin/aquadx/net/games/mai2/Mai2Import.kt

@@ -1,16 +1,16 @@
-package icu.samnyan.aqua.net.games.mai2
+package aquadx.net.games.mai2
 
 import ext.API
 import ext.returns
 import ext.vars
-import icu.samnyan.aqua.net.games.ExportOptions
-import icu.samnyan.aqua.net.games.IExportClass
-import icu.samnyan.aqua.net.games.ImportClass
-import icu.samnyan.aqua.net.games.ImportController
-import icu.samnyan.aqua.sega.maimai2.model.Mai2Repos
-import icu.samnyan.aqua.sega.maimai2.model.Mai2UserLinked
-import icu.samnyan.aqua.sega.maimai2.model.request.Mai2UserFavoriteItem
-import icu.samnyan.aqua.sega.maimai2.model.userdata.*
+import aquadx.net.games.ExportOptions
+import aquadx.net.games.IExportClass
+import aquadx.net.games.ImportClass
+import aquadx.net.games.ImportController
+import aquadx.sega.maimai2.model.Mai2Repos
+import aquadx.sega.maimai2.model.Mai2UserLinked
+import aquadx.sega.maimai2.model.request.Mai2UserFavoriteItem
+import aquadx.sega.maimai2.model.userdata.*
 import org.springframework.web.bind.annotation.RestController
 import kotlin.reflect.full.declaredMembers
 

planet/src/main/kotlin/aquadx/net/games/mai2/Mai2MusicDetailImport.kt

@@ -1,14 +1,14 @@
-package icu.samnyan.aqua.net.games.mai2
+package aquadx.net.games.mai2
 
 import ext.API
 import ext.RB
 import ext.RP
 import ext.minus
-import icu.samnyan.aqua.net.db.AquaUserServices
-import icu.samnyan.aqua.net.utils.SUCCESS
-import icu.samnyan.aqua.sega.general.service.CardService
-import icu.samnyan.aqua.sega.maimai2.model.Mai2Repos
-import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2UserMusicDetail
+import aquadx.net.db.AquaUserServices
+import aquadx.net.utils.SUCCESS
+import aquadx.sega.general.service.CardService
+import aquadx.sega.maimai2.model.Mai2Repos
+import aquadx.sega.maimai2.model.userdata.Mai2UserMusicDetail
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RestController
 

planet/src/main/kotlin/aquadx/net/games/mai2/Maimai2.kt

@@ -1,19 +1,19 @@
-package icu.samnyan.aqua.net.games.mai2
+package aquadx.net.games.mai2
 
 import ext.*
-import icu.samnyan.aqua.net.db.AquaUserServices
-import icu.samnyan.aqua.net.games.*
-import icu.samnyan.aqua.net.utils.SUCCESS
-import icu.samnyan.aqua.net.utils.mai2Scores
-import icu.samnyan.aqua.sega.maimai2.handler.UploadUserPhotoHandler
-import icu.samnyan.aqua.sega.maimai2.model.Mai2Repos
-import icu.samnyan.aqua.sega.maimai2.model.Mai2UserDataRepo
-import icu.samnyan.aqua.sega.maimai2.model.Mai2UserMusicDetailRepo
-import icu.samnyan.aqua.sega.maimai2.model.Mai2UserPlaylogRepo
-import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2UserDetail
-import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2UserGeneralData
-import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2UserLoginBonus
-import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2UserOption
+import aquadx.net.db.AquaUserServices
+import aquadx.net.games.*
+import aquadx.net.utils.SUCCESS
+import aquadx.net.utils.mai2Scores
+import aquadx.sega.maimai2.handler.UploadUserPhotoHandler
+import aquadx.sega.maimai2.model.Mai2Repos
+import aquadx.sega.maimai2.model.Mai2UserDataRepo
+import aquadx.sega.maimai2.model.Mai2UserMusicDetailRepo
+import aquadx.sega.maimai2.model.Mai2UserPlaylogRepo
+import aquadx.sega.maimai2.model.userdata.Mai2UserDetail
+import aquadx.sega.maimai2.model.userdata.Mai2UserGeneralData
+import aquadx.sega.maimai2.model.userdata.Mai2UserLoginBonus
+import aquadx.sega.maimai2.model.userdata.Mai2UserOption
 import org.springframework.http.MediaType
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RestController

planet/src/main/kotlin/aquadx/net/games/ongeki/Ongeki.kt

@@ -1,20 +1,19 @@
-package icu.samnyan.aqua.net.games.ongeki
+package aquadx.net.games.ongeki
 
 import ext.API
 import ext.RP
 import ext.minus
-import icu.samnyan.aqua.net.db.AquaUserServices
-import icu.samnyan.aqua.net.games.*
-import icu.samnyan.aqua.net.utils.ongekiScores
-import icu.samnyan.aqua.sega.ongeki.OgkUserDataRepo
-import icu.samnyan.aqua.sega.ongeki.OgkUserGeneralDataRepo
-import icu.samnyan.aqua.sega.ongeki.OgkUserMusicDetailRepo
-import icu.samnyan.aqua.sega.ongeki.OgkUserOptionRepo
-import icu.samnyan.aqua.sega.ongeki.OgkUserPlaylogRepo
-import icu.samnyan.aqua.sega.ongeki.model.UserData
-import icu.samnyan.aqua.sega.ongeki.model.UserOption
+import aquadx.net.db.AquaUserServices
+import aquadx.net.games.*
+import aquadx.net.utils.ongekiScores
+import aquadx.sega.ongeki.OgkUserDataRepo
+import aquadx.sega.ongeki.OgkUserGeneralDataRepo
+import aquadx.sega.ongeki.OgkUserMusicDetailRepo
+import aquadx.sega.ongeki.OgkUserOptionRepo
+import aquadx.sega.ongeki.OgkUserPlaylogRepo
+import aquadx.sega.ongeki.model.UserData
+import aquadx.sega.ongeki.model.UserOption
 import org.springframework.web.bind.annotation.RestController
-import kotlin.jvm.optionals.getOrNull
 import kotlin.reflect.KMutableProperty1
 import kotlin.reflect.full.memberProperties
 

planet/src/main/kotlin/aquadx/net/games/wacca/Wacca.kt

@@ -1,16 +1,16 @@
-package icu.samnyan.aqua.net.games.wacca
+package aquadx.net.games.wacca
 
 import ext.API
 import ext.RP
 import ext.isoDate
 import ext.utc
-import icu.samnyan.aqua.net.db.AquaUserServices
-import icu.samnyan.aqua.net.games.*
-import icu.samnyan.aqua.net.utils.waccaScores
-import icu.samnyan.aqua.sega.wacca.model.db.WaccaUser
-import icu.samnyan.aqua.sega.wacca.model.db.WcUserBestScoreRepo
-import icu.samnyan.aqua.sega.wacca.model.db.WcUserPlayLogRepo
-import icu.samnyan.aqua.sega.wacca.model.db.WcUserRepo
+import aquadx.net.db.AquaUserServices
+import aquadx.net.games.*
+import aquadx.net.utils.waccaScores
+import aquadx.sega.wacca.model.db.WaccaUser
+import aquadx.sega.wacca.model.db.WcUserBestScoreRepo
+import aquadx.sega.wacca.model.db.WcUserPlayLogRepo
+import aquadx.sega.wacca.model.db.WcUserRepo
 import org.springframework.web.bind.annotation.RestController
 
 @RestController

planet/src/main/kotlin/aquadx/net/transfer/AllNetClient.kt

@@ -1,11 +1,11 @@
-package icu.samnyan.aqua.net.transfer
+package aquadx.net.transfer
 
 import ext.header
 import ext.post
 import ext.request
-import icu.samnyan.aqua.sega.aimedb.AimeDbClient
-import icu.samnyan.aqua.sega.allnet.AllNetBillingDecoder
-import icu.samnyan.aqua.sega.allnet.AllNetBillingDecoder.decodeAllNetResp
+import aquadx.sega.aimedb.AimeDbClient
+import aquadx.sega.allnet.AllNetBillingDecoder
+import aquadx.sega.allnet.AllNetBillingDecoder.decodeAllNetResp
 import java.net.URI
 
 val keychipPattern = Regex("([A-Z\\d]{4}-[A-Z\\d]{11}|[A-Z\\d]{11})")

planet/src/main/kotlin/aquadx/net/transfer/DataBroker.kt

@@ -1,19 +1,19 @@
-package icu.samnyan.aqua.net.transfer
+package aquadx.net.transfer
 
 import ext.*
-import icu.samnyan.aqua.sega.chusan.model.request.Chu3UserAll
-import icu.samnyan.aqua.sega.chusan.model.userdata.Chu3UserActivity
-import icu.samnyan.aqua.sega.chusan.model.userdata.Chu3UserItem
-import icu.samnyan.aqua.sega.chusan.model.userdata.UserMusicDetail
-import icu.samnyan.aqua.sega.maimai2.model.request.Mai2UserAll
-import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2UserFavorite
-import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2UserItem
-import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2UserMusicDetail
-import icu.samnyan.aqua.sega.ongeki.model.OngekiUpsertUserAll
-import icu.samnyan.aqua.sega.ongeki.model.UserItem
-import icu.samnyan.aqua.sega.util.BasicMapper
-import icu.samnyan.aqua.sega.util.IMapper
-import icu.samnyan.aqua.sega.util.StringMapper
+import aquadx.sega.chusan.model.request.Chu3UserAll
+import aquadx.sega.chusan.model.userdata.Chu3UserActivity
+import aquadx.sega.chusan.model.userdata.Chu3UserItem
+import aquadx.sega.chusan.model.userdata.UserMusicDetail
+import aquadx.sega.maimai2.model.request.Mai2UserAll
+import aquadx.sega.maimai2.model.userdata.Mai2UserFavorite
+import aquadx.sega.maimai2.model.userdata.Mai2UserItem
+import aquadx.sega.maimai2.model.userdata.Mai2UserMusicDetail
+import aquadx.sega.ongeki.model.OngekiUpsertUserAll
+import aquadx.sega.ongeki.model.UserItem
+import aquadx.sega.util.BasicMapper
+import aquadx.sega.util.IMapper
+import aquadx.sega.util.StringMapper
 
 
 abstract class DataBroker(
@@ -131,7 +131,7 @@ class OngekiDataBroker(allNet: AllNetClient, log: (String) -> Unit): DataBroker(
     override val mapper = BasicMapper()
     override val url by lazy { allNet.gameUrl.ensureNoEndingSlash() }
 
-    class UserMusicWrapper(var userMusicDetailList: List<icu.samnyan.aqua.sega.ongeki.model.UserMusicDetail>)
+    class UserMusicWrapper(var userMusicDetailList: List<aquadx.sega.ongeki.model.UserMusicDetail>)
 
     override fun pull(): String {
         val (userId, paged) = prePull()

planet/src/main/kotlin/aquadx/net/transfer/TransferApis.kt

@@ -1,4 +1,4 @@
-package icu.samnyan.aqua.net.transfer
+package aquadx.net.transfer
 
 import ext.*
 import jakarta.servlet.http.HttpServletResponse

planet/src/main/kotlin/aquadx/net/utils/AquaNetProps.kt

@@ -1,4 +1,4 @@
-package icu.samnyan.aqua.net.utils
+package aquadx.net.utils
 
 import jakarta.annotation.PostConstruct
 import org.springframework.boot.context.properties.ConfigurationProperties

planet/src/main/kotlin/aquadx/net/utils/ErrorResponse.kt

@@ -1,4 +1,4 @@
-package icu.samnyan.aqua.net.utils
+package aquadx.net.utils
 
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.ControllerAdvice

planet/src/main/kotlin/aquadx/net/utils/GameScoring.kt

@@ -1,4 +1,4 @@
-package icu.samnyan.aqua.net.utils
+package aquadx.net.utils
 
 
 val mai2Scores = listOf(

planet/src/main/kotlin/aquadx/net/utils/PathProps.kt

@@ -1,4 +1,4 @@
-package icu.samnyan.aqua.net.utils
+package aquadx.net.utils
 
 import ext.ensureEndingSlash
 import ext.path

planet/src/main/kotlin/aquadx/sega/aimedb/AimeDB.kt

@@ -1,12 +1,12 @@
-package icu.samnyan.aqua.sega.aimedb
+package aquadx.sega.aimedb
 
 import ext.logger
 import ext.toHex
-import icu.samnyan.aqua.net.Fedy
-import icu.samnyan.aqua.net.db.AquaUserServices
-import icu.samnyan.aqua.sega.allnet.AllNetProps
-import icu.samnyan.aqua.sega.general.model.Card
-import icu.samnyan.aqua.sega.general.service.CardService
+import aquadx.net.Fedy
+import aquadx.net.db.AquaUserServices
+import aquadx.sega.allnet.AllNetProps
+import aquadx.sega.general.model.Card
+import aquadx.sega.general.service.CardService
 import io.netty.buffer.ByteBuf
 import io.netty.buffer.ByteBufUtil
 import io.netty.buffer.Unpooled

planet/src/main/kotlin/aquadx/sega/aimedb/AimeDbClient.kt

@@ -1,4 +1,4 @@
-package icu.samnyan.aqua.sega.aimedb
+package aquadx.sega.aimedb
 
 import ext.minus
 import io.netty.buffer.ByteBuf

planet/src/main/kotlin/aquadx/sega/aimedb/AimeDbDecoder.kt

@@ -1,4 +1,4 @@
-package icu.samnyan.aqua.sega.aimedb
+package aquadx.sega.aimedb
 
 import io.netty.buffer.ByteBuf
 import io.netty.channel.ChannelHandlerContext

planet/src/main/kotlin/aquadx/sega/aimedb/AimeDbEncoder.kt

@@ -1,4 +1,4 @@
-package icu.samnyan.aqua.sega.aimedb
+package aquadx.sega.aimedb
 
 import io.netty.buffer.ByteBuf
 import io.netty.channel.ChannelHandlerContext

planet/src/main/kotlin/aquadx/sega/aimedb/AimeDbEncryption.kt

@@ -1,4 +1,4 @@
-package icu.samnyan.aqua.sega.aimedb
+package aquadx.sega.aimedb
 
 import io.netty.buffer.ByteBuf
 import io.netty.buffer.Unpooled.copiedBuffer

planet/src/main/kotlin/aquadx/sega/aimedb/AimeDbServer.kt

@@ -1,4 +1,4 @@
-package icu.samnyan.aqua.sega.aimedb
+package aquadx.sega.aimedb
 
 import ext.logger
 import io.netty.bootstrap.ServerBootstrap

planet/src/main/kotlin/aquadx/sega/allnet/AllNet.kt

@@ -1,8 +1,8 @@
-package icu.samnyan.aqua.sega.allnet
+package aquadx.sega.allnet
 
 import ext.*
-import icu.samnyan.aqua.net.db.AquaNetUserRepo
-import icu.samnyan.aqua.sega.allnet.AllNetBillingDecoder.decodeAllNet
+import aquadx.net.db.AquaNetUserRepo
+import aquadx.sega.allnet.AllNetBillingDecoder.decodeAllNet
 import jakarta.servlet.http.HttpServletRequest
 import jakarta.servlet.http.HttpServletResponse
 import org.springframework.boot.context.properties.ConfigurationProperties

planet/src/main/kotlin/aquadx/sega/allnet/AllNetBillingDecoder.kt

@@ -1,8 +1,8 @@
-package icu.samnyan.aqua.sega.allnet
+package aquadx.sega.allnet
 
 import ext.bodyString
 import ext.header
-import icu.samnyan.aqua.sega.util.ZLib
+import aquadx.sega.util.ZLib
 import java.net.http.HttpResponse
 import java.util.*
 import kotlin.text.Charsets.UTF_8

planet/src/main/kotlin/aquadx/sega/allnet/AllNetSecure.kt

@@ -1,8 +1,8 @@
-package icu.samnyan.aqua.sega.allnet
+package aquadx.sega.allnet
 
 import ext.Str
-import icu.samnyan.aqua.net.FrontierProps
-import icu.samnyan.aqua.net.components.GeoIP
+import aquadx.net.FrontierProps
+import aquadx.net.components.GeoIP
 import jakarta.servlet.http.HttpServletRequest
 import jakarta.servlet.http.HttpServletRequestWrapper
 import jakarta.servlet.http.HttpServletResponse

planet/src/main/kotlin/aquadx/sega/allnet/Keychip.kt

@@ -1,4 +1,4 @@
-package icu.samnyan.aqua.sega.allnet
+package aquadx.sega.allnet
 
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.stereotype.Repository

planet/src/main/kotlin/aquadx/sega/allnet/KeychipSession.kt

@@ -1,7 +1,7 @@
-package icu.samnyan.aqua.sega.allnet
+package aquadx.sega.allnet
 
 import ext.async
-import icu.samnyan.aqua.net.db.AquaNetUser
+import aquadx.net.db.AquaNetUser
 import jakarta.transaction.Transactional
 import org.slf4j.LoggerFactory
 import org.springframework.data.jpa.repository.JpaRepository

planet/src/main/kotlin/aquadx/sega/billing/Billing.kt

@@ -1,8 +1,8 @@
-package icu.samnyan.aqua.sega.billing
+package aquadx.sega.billing
 
+import aquadx.sega.allnet.AllNetBillingDecoder
 import ext.logger
 import ext.toUrl
-import icu.samnyan.aqua.sega.allnet.AllNetBillingDecoder.decodeBilling
 import jakarta.annotation.PostConstruct
 import jakarta.servlet.http.HttpServletRequest
 import org.eclipse.jetty.http.HttpVersion
@@ -55,7 +55,7 @@ class Billing(
     @PostMapping("/request", produces = ["text/plain"])
     fun powerOn(dataStream: InputStream, req: HttpServletRequest?): String {
         val bytes = dataStream.readAllBytes()
-        val reqMap = decodeBilling(bytes)
+        val reqMap = AllNetBillingDecoder.decodeBilling(bytes)
 
         logger.info("Billing : $reqMap")
 

planet/src/main/kotlin/aquadx/sega/cardmaker/CardMakerController.kt

@@ -1,11 +1,11 @@
-package icu.samnyan.aqua.sega.cardmaker
+package aquadx.sega.cardmaker
 
+import aquadx.sega.allnet.TokenChecker
+import aquadx.sega.util.BasicMapper
 import ext.API
 import ext.logger
 import ext.long
 import ext.parsing
-import icu.samnyan.aqua.sega.allnet.TokenChecker
-import icu.samnyan.aqua.sega.util.BasicMapper
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.web.bind.annotation.ModelAttribute
 import org.springframework.web.bind.annotation.RequestMapping

planet/src/main/kotlin/aquadx/sega/cardmaker/CardMakerControllerAdvice.kt

@@ -1,4 +1,4 @@
-package icu.samnyan.aqua.sega.cardmaker
+package aquadx.sega.cardmaker
 
 import com.fasterxml.jackson.core.type.TypeReference
 import com.fasterxml.jackson.databind.ObjectMapper
@@ -11,7 +11,7 @@ import java.nio.charset.StandardCharsets
 /**
  * @author samnyan (privateamusement@protonmail.com)
  */
-@RestControllerAdvice(basePackages = ["icu.samnyan.aqua.sega.cardmaker"])
+@RestControllerAdvice(basePackages = ["aquadx.sega.cardmaker"])
 class CardMakerControllerAdvice {
     val logger = logger()
     val mapper = ObjectMapper()

planet/src/main/kotlin/aquadx/sega/chusan/ChusanController.kt

@@ -1,19 +1,19 @@
-package icu.samnyan.aqua.sega.chusan
+package aquadx.sega.chusan
 
 import ext.*
-import icu.samnyan.aqua.net.db.AquaUserServices
-import icu.samnyan.aqua.net.games.chu3.Chusan
-import icu.samnyan.aqua.net.utils.simpleDescribe
-import icu.samnyan.aqua.sega.allnet.TokenChecker
-import icu.samnyan.aqua.sega.chusan.handler.chusanInit
-import icu.samnyan.aqua.sega.chusan.model.Chu3Repos
-import icu.samnyan.aqua.sega.general.GameMusicPopularity
-import icu.samnyan.aqua.sega.general.MeowApi
-import icu.samnyan.aqua.sega.general.RequestContext
-import icu.samnyan.aqua.sega.general.service.CardService
-import icu.samnyan.aqua.sega.util.BasicMapper
-import icu.samnyan.aqua.sega.util.StringMapper
-import icu.samnyan.aqua.spring.Metrics
+import aquadx.net.db.AquaUserServices
+import aquadx.net.games.chu3.Chusan
+import aquadx.net.utils.simpleDescribe
+import aquadx.sega.allnet.TokenChecker
+import aquadx.sega.chusan.handler.chusanInit
+import aquadx.sega.chusan.model.Chu3Repos
+import aquadx.sega.general.GameMusicPopularity
+import aquadx.sega.general.MeowApi
+import aquadx.sega.general.RequestContext
+import aquadx.sega.general.service.CardService
+import aquadx.sega.util.BasicMapper
+import aquadx.sega.util.StringMapper
+import aquadx.spring.Metrics
 import jakarta.servlet.http.HttpServletRequest
 import org.slf4j.LoggerFactory
 import org.springframework.web.bind.annotation.RestController

planet/src/main/kotlin/aquadx/sega/chusan/ChusanData.kt

@@ -1,4 +1,4 @@
-package icu.samnyan.aqua.sega.chusan
+package aquadx.sega.chusan
 
 
 object ChusanData {

planet/src/main/kotlin/aquadx/sega/chusan/ChusanProps.kt

@@ -1,4 +1,4 @@
-package icu.samnyan.aqua.sega.chusan
+package aquadx.sega.chusan
 
 import org.springframework.boot.context.properties.ConfigurationProperties
 import org.springframework.context.annotation.Configuration

planet/src/main/kotlin/aquadx/sega/chusan/ChusanVersionHelper.kt

@@ -1,7 +1,7 @@
-package icu.samnyan.aqua.sega.chusan
+package aquadx.sega.chusan
 
 import ext.logger
-import icu.samnyan.aqua.sega.chusan.model.Chu3Repos
+import aquadx.sega.chusan.model.Chu3Repos
 import org.springframework.stereotype.Component
 
 

planet/src/main/kotlin/aquadx/sega/chusan/handler/ChusanApis.kt

@@ -1,14 +1,14 @@
-package icu.samnyan.aqua.sega.chusan.handler
+package aquadx.sega.chusan.handler
 
 import ext.*
-import icu.samnyan.aqua.sega.allnet.TokenChecker
-import icu.samnyan.aqua.sega.chusan.ChusanController
-import icu.samnyan.aqua.sega.chusan.ChusanData
-import icu.samnyan.aqua.sega.chusan.model.request.UserCMissionResp
-import icu.samnyan.aqua.sega.chusan.model.userdata.Chu3UserItem
-import icu.samnyan.aqua.sega.chusan.model.userdata.UserMusicDetail
-import icu.samnyan.aqua.sega.general.model.CardStatus
-import icu.samnyan.aqua.sega.general.model.UserRecentRating
+import aquadx.sega.allnet.TokenChecker
+import aquadx.sega.chusan.ChusanController
+import aquadx.sega.chusan.ChusanData
+import aquadx.sega.chusan.model.request.UserCMissionResp
+import aquadx.sega.chusan.model.userdata.Chu3UserItem
+import aquadx.sega.chusan.model.userdata.UserMusicDetail
+import aquadx.sega.general.model.CardStatus
+import aquadx.sega.general.model.UserRecentRating
 import org.springframework.data.repository.findByIdOrNull
 import java.time.format.DateTimeFormatter
 

planet/src/main/kotlin/aquadx/sega/chusan/handler/ChusanCMApis.kt

@@ -1,11 +1,11 @@
-package icu.samnyan.aqua.sega.chusan.handler
+package aquadx.sega.chusan.handler
 
 import ext.*
-import icu.samnyan.aqua.sega.chusan.ChusanController
-import icu.samnyan.aqua.sega.chusan.model.request.UpsertUserGacha
-import icu.samnyan.aqua.sega.chusan.model.request.UserEmoney
-import icu.samnyan.aqua.sega.chusan.model.userdata.Chu3UserItem
-import icu.samnyan.aqua.sega.chusan.model.userdata.UserCardPrintState
+import aquadx.sega.chusan.ChusanController
+import aquadx.sega.chusan.model.request.UpsertUserGacha
+import aquadx.sega.chusan.model.request.UserEmoney
+import aquadx.sega.chusan.model.userdata.Chu3UserItem
+import aquadx.sega.chusan.model.userdata.UserCardPrintState
 import java.time.LocalDateTime
 
 fun ChusanController.cmApiInit() {

planet/src/main/kotlin/aquadx/sega/chusan/handler/ChusanMatchingApis.kt

@@ -1,14 +1,14 @@
 @file:Suppress("UNCHECKED_CAST")
 
-package icu.samnyan.aqua.sega.chusan.handler
+package aquadx.sega.chusan.handler
 
 import ext.JDict
 import ext.int
 import ext.millis
 import ext.parsing
-import icu.samnyan.aqua.sega.chusan.ChusanController
-import icu.samnyan.aqua.sega.chusan.model.request.MatchingWaitState
-import icu.samnyan.aqua.sega.chusan.model.userdata.Chu3MatchingMemberReq
+import aquadx.sega.chusan.ChusanController
+import aquadx.sega.chusan.model.request.MatchingWaitState
+import aquadx.sega.chusan.model.userdata.Chu3MatchingMemberReq
 
 
 fun ChusanController.matchingApiInit() {

planet/src/main/kotlin/aquadx/sega/chusan/handler/ChusanUpsertApis.kt

@@ -1,11 +1,11 @@
-package icu.samnyan.aqua.sega.chusan.handler
+package aquadx.sega.chusan.handler
 
 import ext.*
-import icu.samnyan.aqua.sega.chusan.ChusanController
-import icu.samnyan.aqua.sega.chusan.model.request.Chu3UserAll
-import icu.samnyan.aqua.sega.chusan.model.userdata.*
-import icu.samnyan.aqua.sega.general.model.CardStatus
-import icu.samnyan.aqua.sega.general.model.UserRecentRating
+import aquadx.sega.chusan.ChusanController
+import aquadx.sega.chusan.model.request.Chu3UserAll
+import aquadx.sega.chusan.model.userdata.*
+import aquadx.sega.general.model.CardStatus
+import aquadx.sega.general.model.UserRecentRating
 import kotlinx.serialization.encodeToString
 
 @Suppress("UNCHECKED_CAST")

planet/src/main/kotlin/aquadx/sega/chusan/model/Chu3Repos.kt

@@ -1,20 +1,20 @@
 @file:Suppress("FunctionName")
 
-package icu.samnyan.aqua.sega.chusan.model
+package aquadx.sega.chusan.model
 
-import icu.samnyan.aqua.net.games.GenericPlaylogRepo
-import icu.samnyan.aqua.net.games.GenericUserDataRepo
-import icu.samnyan.aqua.net.games.GenericUserMusicRepo
-import icu.samnyan.aqua.net.games.IUserRepo
-import icu.samnyan.aqua.sega.chusan.model.userdata.*
+import aquadx.net.games.GenericPlaylogRepo
+import aquadx.net.games.GenericUserDataRepo
+import aquadx.net.games.GenericUserMusicRepo
+import aquadx.net.games.IUserRepo
+import aquadx.sega.chusan.model.userdata.*
 import org.springframework.data.domain.Page
 import org.springframework.data.domain.Pageable
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.data.jpa.repository.Query
 import org.springframework.data.repository.NoRepositoryBean
 import org.springframework.stereotype.Component
-import icu.samnyan.aqua.sega.util.GameDataService
-import icu.samnyan.aqua.sega.util.StaticRepo
+import aquadx.sega.util.GameDataService
+import aquadx.sega.util.StaticRepo
 
 
 @NoRepositoryBean

planet/src/main/kotlin/aquadx/sega/diva/DivaController.kt

@@ -1,22 +1,22 @@
-package icu.samnyan.aqua.sega.diva
+package aquadx.sega.diva
 
 import ext.JDict
 import ext.MutJDict
 import ext.emptyMap
 import ext.logger
-import icu.samnyan.aqua.sega.diva.handler.AttendHandler
-import icu.samnyan.aqua.sega.diva.handler.PingHandler
-import icu.samnyan.aqua.sega.diva.handler.card.CardProcedureHandler
-import icu.samnyan.aqua.sega.diva.handler.card.ChangeNameHandler
-import icu.samnyan.aqua.sega.diva.handler.card.ChangePasswdHandler
-import icu.samnyan.aqua.sega.diva.handler.card.RegistrationHandler
-import icu.samnyan.aqua.sega.diva.handler.databank.*
-import icu.samnyan.aqua.sega.diva.handler.ingame.*
-import icu.samnyan.aqua.sega.diva.handler.user.*
-import icu.samnyan.aqua.sega.diva.model.*
-import icu.samnyan.aqua.sega.diva.util.DivaMapper
-import icu.samnyan.aqua.sega.diva.util.DivaTime
-import icu.samnyan.aqua.sega.diva.util.URIEncoder.encode
+import aquadx.sega.diva.handler.AttendHandler
+import aquadx.sega.diva.handler.PingHandler
+import aquadx.sega.diva.handler.card.CardProcedureHandler
+import aquadx.sega.diva.handler.card.ChangeNameHandler
+import aquadx.sega.diva.handler.card.ChangePasswdHandler
+import aquadx.sega.diva.handler.card.RegistrationHandler
+import aquadx.sega.diva.handler.databank.*
+import aquadx.sega.diva.handler.ingame.*
+import aquadx.sega.diva.handler.user.*
+import aquadx.sega.diva.model.*
+import aquadx.sega.diva.util.DivaMapper
+import aquadx.sega.diva.util.DivaTime
+import aquadx.sega.diva.util.URIEncoder.encode
 import jakarta.servlet.http.HttpServletRequest
 import org.springframework.http.MediaType
 import org.springframework.web.bind.annotation.PostMapping

planet/src/main/kotlin/aquadx/sega/diva/DivaRepos.kt

@@ -1,12 +1,12 @@
-package icu.samnyan.aqua.sega.diva
+package aquadx.sega.diva
 
 import ext.invoke
-import icu.samnyan.aqua.sega.diva.model.common.Difficulty
-import icu.samnyan.aqua.sega.diva.model.common.Edition
-import icu.samnyan.aqua.sega.diva.model.db.gamedata.*
-import icu.samnyan.aqua.sega.diva.model.db.userdata.*
-import icu.samnyan.aqua.sega.diva.util.ProfileNotFoundException
-import icu.samnyan.aqua.sega.diva.util.SessionNotFoundException
+import aquadx.sega.diva.model.common.Difficulty
+import aquadx.sega.diva.model.common.Edition
+import aquadx.sega.diva.model.db.gamedata.*
+import aquadx.sega.diva.model.db.userdata.*
+import aquadx.sega.diva.util.ProfileNotFoundException
+import aquadx.sega.diva.util.SessionNotFoundException
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.data.jpa.repository.Query
 import org.springframework.data.repository.query.Param

planet/src/main/kotlin/aquadx/sega/diva/DivaServices.kt

@@ -1,9 +1,9 @@
-package icu.samnyan.aqua.sega.diva
+package aquadx.sega.diva
 
-import icu.samnyan.aqua.sega.diva.model.RegistrationRequest
-import icu.samnyan.aqua.sega.diva.model.db.userdata.PlayerCustomize
-import icu.samnyan.aqua.sega.diva.model.db.userdata.PlayerModule
-import icu.samnyan.aqua.sega.diva.model.db.userdata.PlayerProfile
+import aquadx.sega.diva.model.RegistrationRequest
+import aquadx.sega.diva.model.db.userdata.PlayerCustomize
+import aquadx.sega.diva.model.db.userdata.PlayerModule
+import aquadx.sega.diva.model.db.userdata.PlayerProfile
 import org.apache.commons.lang3.StringUtils
 import org.springframework.stereotype.Component
 import org.springframework.stereotype.Service

planet/src/main/kotlin/aquadx/sega/diva/handler/InitHandlers.kt

@@ -1,10 +1,10 @@
-package icu.samnyan.aqua.sega.diva.handler
+package aquadx.sega.diva.handler
 
 import ext.csv
-import icu.samnyan.aqua.sega.diva.model.BaseRequest
-import icu.samnyan.aqua.sega.diva.model.PingResponse
-import icu.samnyan.aqua.sega.general.dao.PropertyEntryRepository
-import icu.samnyan.aqua.sega.general.model.PropertyEntry
+import aquadx.sega.diva.model.BaseRequest
+import aquadx.sega.diva.model.PingResponse
+import aquadx.sega.general.dao.PropertyEntryRepository
+import aquadx.sega.general.model.PropertyEntry
 import org.springframework.stereotype.Component
 import java.time.LocalDateTime
 import java.util.*

planet/src/main/kotlin/aquadx/sega/diva/handler/card/CardProcedureHandler.kt

@@ -1,11 +1,11 @@
-package icu.samnyan.aqua.sega.diva.handler.card
+package aquadx.sega.diva.handler.card
 
-import icu.samnyan.aqua.sega.diva.DivaRepos
-import icu.samnyan.aqua.sega.diva.model.CardProcedureRequest
-import icu.samnyan.aqua.sega.diva.model.CardProcedureResponse
-import icu.samnyan.aqua.sega.diva.model.common.Result
-import icu.samnyan.aqua.sega.diva.model.common.StartMode
-import icu.samnyan.aqua.sega.diva.model.db.userdata.GameSession
+import aquadx.sega.diva.DivaRepos
+import aquadx.sega.diva.model.CardProcedureRequest
+import aquadx.sega.diva.model.CardProcedureResponse
+import aquadx.sega.diva.model.common.Result
+import aquadx.sega.diva.model.common.StartMode
+import aquadx.sega.diva.model.db.userdata.GameSession
 import org.springframework.stereotype.Component
 import java.time.LocalDateTime
 import java.util.concurrent.ThreadLocalRandom

planet/src/main/kotlin/aquadx/sega/diva/handler/card/ChangeNameHandler.kt

@@ -1,9 +1,9 @@
-package icu.samnyan.aqua.sega.diva.handler.card
+package aquadx.sega.diva.handler.card
 
-import icu.samnyan.aqua.sega.diva.DivaRepos
-import icu.samnyan.aqua.sega.diva.model.ChangeNameRequest
-import icu.samnyan.aqua.sega.diva.model.ChangeNameResponse
-import icu.samnyan.aqua.sega.diva.model.common.Result
+import aquadx.sega.diva.DivaRepos
+import aquadx.sega.diva.model.ChangeNameRequest
+import aquadx.sega.diva.model.ChangeNameResponse
+import aquadx.sega.diva.model.common.Result
 import org.springframework.stereotype.Component
 
 /**

planet/src/main/kotlin/aquadx/sega/diva/handler/card/ChangePasswdHandler.kt

@@ -1,10 +1,10 @@
-package icu.samnyan.aqua.sega.diva.handler.card
+package aquadx.sega.diva.handler.card
 
-import icu.samnyan.aqua.sega.diva.DivaRepos
-import icu.samnyan.aqua.sega.diva.model.ChangePasswdRequest
-import icu.samnyan.aqua.sega.diva.model.ChangePasswdResponse
-import icu.samnyan.aqua.sega.diva.model.common.PassStat
-import icu.samnyan.aqua.sega.diva.model.common.Result
+import aquadx.sega.diva.DivaRepos
+import aquadx.sega.diva.model.ChangePasswdRequest
+import aquadx.sega.diva.model.ChangePasswdResponse
+import aquadx.sega.diva.model.common.PassStat
+import aquadx.sega.diva.model.common.Result
 import org.springframework.stereotype.Component
 
 /**

planet/src/main/kotlin/aquadx/sega/diva/handler/card/RegistrationHandler.kt

@@ -1,9 +1,9 @@
-package icu.samnyan.aqua.sega.diva.handler.card
+package aquadx.sega.diva.handler.card
 
-import icu.samnyan.aqua.sega.diva.PlayerProfileService
-import icu.samnyan.aqua.sega.diva.model.RegistrationRequest
-import icu.samnyan.aqua.sega.diva.model.RegistrationResponse
-import icu.samnyan.aqua.sega.diva.model.common.Result
+import aquadx.sega.diva.PlayerProfileService
+import aquadx.sega.diva.model.RegistrationRequest
+import aquadx.sega.diva.model.RegistrationResponse
+import aquadx.sega.diva.model.common.Result
 import org.springframework.stereotype.Component
 
 /**

planet/src/main/kotlin/aquadx/sega/diva/handler/databank/ContestInfoHandler.kt

@@ -1,10 +1,10 @@
-package icu.samnyan.aqua.sega.diva.handler.databank
+package aquadx.sega.diva.handler.databank
 
-import icu.samnyan.aqua.sega.diva.DivaRepos
-import icu.samnyan.aqua.sega.diva.model.BaseRequest
-import icu.samnyan.aqua.sega.diva.model.ContestInfoResponse
-import icu.samnyan.aqua.sega.diva.model.db.gamedata.Contest
-import icu.samnyan.aqua.sega.diva.util.URIEncoder.encode
+import aquadx.sega.diva.DivaRepos
+import aquadx.sega.diva.model.BaseRequest
+import aquadx.sega.diva.model.ContestInfoResponse
+import aquadx.sega.diva.model.db.gamedata.Contest
+import aquadx.sega.diva.util.URIEncoder.encode
 import org.springframework.stereotype.Component
 import java.time.LocalDateTime
 import java.util.function.Consumer

planet/src/main/kotlin/aquadx/sega/diva/handler/databank/FestaInfoHandler.kt

@@ -1,9 +1,9 @@
-package icu.samnyan.aqua.sega.diva.handler.databank
+package aquadx.sega.diva.handler.databank
 
-import icu.samnyan.aqua.sega.diva.FestaRepository
-import icu.samnyan.aqua.sega.diva.model.BaseRequest
-import icu.samnyan.aqua.sega.diva.model.FestaInfoResponse
-import icu.samnyan.aqua.sega.diva.model.common.collection.FestaCollection
+import aquadx.sega.diva.FestaRepository
+import aquadx.sega.diva.model.BaseRequest
+import aquadx.sega.diva.model.FestaInfoResponse
+import aquadx.sega.diva.model.common.collection.FestaCollection
 import org.springframework.stereotype.Component
 
 /**

planet/src/main/kotlin/aquadx/sega/diva/handler/databank/NvRankingHandler.kt

@@ -1,7 +1,7 @@
-package icu.samnyan.aqua.sega.diva.handler.databank
+package aquadx.sega.diva.handler.databank
 
-import icu.samnyan.aqua.sega.diva.model.BaseRequest
-import icu.samnyan.aqua.sega.diva.model.NvRankingResponse
+import aquadx.sega.diva.model.BaseRequest
+import aquadx.sega.diva.model.NvRankingResponse
 import org.springframework.stereotype.Component
 
 /**

planet/src/main/kotlin/aquadx/sega/diva/handler/databank/PsRankingHandler.kt

@@ -1,13 +1,13 @@
-package icu.samnyan.aqua.sega.diva.handler.databank
+package aquadx.sega.diva.handler.databank
 
 import ext.csv
-import icu.samnyan.aqua.sega.diva.DivaRepos
-import icu.samnyan.aqua.sega.diva.model.PsRankingRequest
-import icu.samnyan.aqua.sega.diva.model.PsRankingResponse
-import icu.samnyan.aqua.sega.diva.model.common.Difficulty
-import icu.samnyan.aqua.sega.diva.model.common.Edition
-import icu.samnyan.aqua.sega.diva.model.common.collection.PsRankingCollection
-import icu.samnyan.aqua.sega.diva.util.URIEncoder.encode
+import aquadx.sega.diva.DivaRepos
+import aquadx.sega.diva.model.PsRankingRequest
+import aquadx.sega.diva.model.PsRankingResponse
+import aquadx.sega.diva.model.common.Difficulty
+import aquadx.sega.diva.model.common.Edition
+import aquadx.sega.diva.model.common.collection.PsRankingCollection
+import aquadx.sega.diva.util.URIEncoder.encode
 import org.springframework.stereotype.Component
 import java.time.LocalDateTime
 import java.util.*

planet/src/main/kotlin/aquadx/sega/diva/handler/databank/PvListHandler.kt

@@ -1,11 +1,11 @@
-package icu.samnyan.aqua.sega.diva.handler.databank
+package aquadx.sega.diva.handler.databank
 
-import icu.samnyan.aqua.sega.diva.DivaRepos
-import icu.samnyan.aqua.sega.diva.model.BaseRequest
-import icu.samnyan.aqua.sega.diva.model.PvListResponse
-import icu.samnyan.aqua.sega.diva.model.common.Difficulty
-import icu.samnyan.aqua.sega.diva.model.db.gamedata.PvEntry
-import icu.samnyan.aqua.sega.diva.util.URIEncoder.encode
+import aquadx.sega.diva.DivaRepos
+import aquadx.sega.diva.model.BaseRequest
+import aquadx.sega.diva.model.PvListResponse
+import aquadx.sega.diva.model.common.Difficulty
+import aquadx.sega.diva.model.db.gamedata.PvEntry
+import aquadx.sega.diva.util.URIEncoder.encode
 import org.springframework.stereotype.Component
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter

planet/src/main/kotlin/aquadx/sega/diva/handler/databank/ShopCatalogHandler.kt

@@ -1,9 +1,9 @@
-package icu.samnyan.aqua.sega.diva.handler.databank
+package aquadx.sega.diva.handler.databank
 
-import icu.samnyan.aqua.sega.diva.DivaModuleRepository
-import icu.samnyan.aqua.sega.diva.model.BaseRequest
-import icu.samnyan.aqua.sega.diva.model.ShopCatalogResponse
-import icu.samnyan.aqua.sega.diva.util.URIEncoder.encode
+import aquadx.sega.diva.DivaModuleRepository
+import aquadx.sega.diva.model.BaseRequest
+import aquadx.sega.diva.model.ShopCatalogResponse
+import aquadx.sega.diva.util.URIEncoder.encode
 import org.springframework.stereotype.Component
 import java.time.LocalDateTime
 

planet/src/main/kotlin/aquadx/sega/diva/handler/ingame/BuyCstmzItmHandler.kt

@@ -1,10 +1,10 @@
-package icu.samnyan.aqua.sega.diva.handler.ingame
+package aquadx.sega.diva.handler.ingame
 
 import ext.invoke
-import icu.samnyan.aqua.sega.diva.DivaRepos
-import icu.samnyan.aqua.sega.diva.model.BuyCstmzItmRequest
-import icu.samnyan.aqua.sega.diva.model.BuyCstmzItmResponse
-import icu.samnyan.aqua.sega.diva.model.common.Result
+import aquadx.sega.diva.DivaRepos
+import aquadx.sega.diva.model.BuyCstmzItmRequest
+import aquadx.sega.diva.model.BuyCstmzItmResponse
+import aquadx.sega.diva.model.common.Result
 import org.springframework.stereotype.Component
 
 /**

planet/src/main/kotlin/aquadx/sega/diva/handler/ingame/BuyModuleHandler.kt

@@ -1,9 +1,9 @@
-package icu.samnyan.aqua.sega.diva.handler.ingame
+package aquadx.sega.diva.handler.ingame
 
-import icu.samnyan.aqua.sega.diva.DivaRepos
-import icu.samnyan.aqua.sega.diva.model.BuyModuleRequest
-import icu.samnyan.aqua.sega.diva.model.BuyModuleResponse
-import icu.samnyan.aqua.sega.diva.model.common.Result
+import aquadx.sega.diva.DivaRepos
+import aquadx.sega.diva.model.BuyModuleRequest
+import aquadx.sega.diva.model.BuyModuleResponse
+import aquadx.sega.diva.model.common.Result
 import org.springframework.stereotype.Component
 
 /**

planet/src/main/kotlin/aquadx/sega/diva/handler/ingame/GetPvPdHandler.kt

@@ -1,14 +1,14 @@
-package icu.samnyan.aqua.sega.diva.handler.ingame
+package aquadx.sega.diva.handler.ingame
 
-import icu.samnyan.aqua.sega.diva.DivaRepos
-import icu.samnyan.aqua.sega.diva.model.GetPvPdRequest
-import icu.samnyan.aqua.sega.diva.model.GetPvPdResponse
-import icu.samnyan.aqua.sega.diva.model.common.Difficulty
-import icu.samnyan.aqua.sega.diva.model.common.Edition
-import icu.samnyan.aqua.sega.diva.model.db.userdata.PlayerPvCustomize
-import icu.samnyan.aqua.sega.diva.model.db.userdata.PlayerPvRecord
-import icu.samnyan.aqua.sega.diva.util.DivaTime
-import icu.samnyan.aqua.sega.diva.util.URIEncoder.encode
+import aquadx.sega.diva.DivaRepos
+import aquadx.sega.diva.model.GetPvPdRequest
+import aquadx.sega.diva.model.GetPvPdResponse
+import aquadx.sega.diva.model.common.Difficulty
+import aquadx.sega.diva.model.common.Edition
+import aquadx.sega.diva.model.db.userdata.PlayerPvCustomize
+import aquadx.sega.diva.model.db.userdata.PlayerPvRecord
+import aquadx.sega.diva.util.DivaTime
+import aquadx.sega.diva.util.URIEncoder.encode
 import org.springframework.stereotype.Component
 import java.util.function.Supplier
 

planet/src/main/kotlin/aquadx/sega/diva/handler/ingame/ShopExitHandler.kt

@@ -1,11 +1,11 @@
-package icu.samnyan.aqua.sega.diva.handler.ingame
+package aquadx.sega.diva.handler.ingame
 
 import ext.csv
-import icu.samnyan.aqua.sega.diva.DivaRepos
-import icu.samnyan.aqua.sega.diva.model.ShopExitRequest
-import icu.samnyan.aqua.sega.diva.model.ShopExitResponse
-import icu.samnyan.aqua.sega.diva.model.common.Result
-import icu.samnyan.aqua.sega.diva.model.db.userdata.PlayerPvCustomize
+import aquadx.sega.diva.DivaRepos
+import aquadx.sega.diva.model.ShopExitRequest
+import aquadx.sega.diva.model.ShopExitResponse
+import aquadx.sega.diva.model.common.Result
+import aquadx.sega.diva.model.db.userdata.PlayerPvCustomize
 import org.springframework.stereotype.Component
 import java.util.function.Supplier
 

planet/src/main/kotlin/aquadx/sega/diva/handler/ingame/StageResultHandler.kt

@@ -1,12 +1,12 @@
-package icu.samnyan.aqua.sega.diva.handler.ingame
+package aquadx.sega.diva.handler.ingame
 
 import ext.logger
-import icu.samnyan.aqua.sega.diva.DivaRepos
-import icu.samnyan.aqua.sega.diva.model.StageResultRequest
-import icu.samnyan.aqua.sega.diva.model.StageResultResponse
-import icu.samnyan.aqua.sega.diva.model.common.*
-import icu.samnyan.aqua.sega.diva.model.db.userdata.*
-import icu.samnyan.aqua.sega.diva.util.DivaCalculator
+import aquadx.sega.diva.DivaRepos
+import aquadx.sega.diva.model.StageResultRequest
+import aquadx.sega.diva.model.StageResultResponse
+import aquadx.sega.diva.model.common.*
+import aquadx.sega.diva.model.db.userdata.*
+import aquadx.sega.diva.util.DivaCalculator
 import org.apache.commons.lang3.StringUtils
 import org.springframework.stereotype.Component
 import java.lang.String

planet/src/main/kotlin/aquadx/sega/diva/handler/ingame/StageStartHandler.kt

@@ -1,8 +1,8 @@
-package icu.samnyan.aqua.sega.diva.handler.ingame
+package aquadx.sega.diva.handler.ingame
 
 import ext.emptyMap
-import icu.samnyan.aqua.sega.diva.DivaRepos
-import icu.samnyan.aqua.sega.diva.model.StageStartRequest
+import aquadx.sega.diva.DivaRepos
+import aquadx.sega.diva.model.StageStartRequest
 import org.springframework.stereotype.Component
 
 /**

planet/src/main/kotlin/aquadx/sega/diva/handler/ingame/StoreSsHandler.kt

@@ -1,12 +1,12 @@
-package icu.samnyan.aqua.sega.diva.handler.ingame
+package aquadx.sega.diva.handler.ingame
 
 import ext.csv
 import ext.logger
-import icu.samnyan.aqua.sega.diva.DIVA_BAD
-import icu.samnyan.aqua.sega.diva.DIVA_OK
-import icu.samnyan.aqua.sega.diva.DivaRepos
-import icu.samnyan.aqua.sega.diva.model.StoreSsRequest
-import icu.samnyan.aqua.sega.diva.model.db.userdata.PlayerScreenShot
+import aquadx.sega.diva.DIVA_BAD
+import aquadx.sega.diva.DIVA_OK
+import aquadx.sega.diva.DivaRepos
+import aquadx.sega.diva.model.StoreSsRequest
+import aquadx.sega.diva.model.db.userdata.PlayerScreenShot
 import org.springframework.stereotype.Component
 import org.springframework.web.multipart.MultipartFile
 import java.io.IOException

planet/src/main/kotlin/aquadx/sega/diva/handler/user/EndHandler.kt

@@ -1,15 +1,15 @@
-package icu.samnyan.aqua.sega.diva.handler.user
+package aquadx.sega.diva.handler.user
 
-import icu.samnyan.aqua.sega.diva.DIVA_OK
-import icu.samnyan.aqua.sega.diva.DivaRepos
-import icu.samnyan.aqua.sega.diva.model.StageResultRequest
-import icu.samnyan.aqua.sega.diva.model.common.ContestBorder
-import icu.samnyan.aqua.sega.diva.model.common.Difficulty
-import icu.samnyan.aqua.sega.diva.model.common.Edition
-import icu.samnyan.aqua.sega.diva.model.common.SortMode
-import icu.samnyan.aqua.sega.diva.model.db.gamedata.Contest
-import icu.samnyan.aqua.sega.diva.model.db.userdata.PlayerContest
-import icu.samnyan.aqua.sega.diva.util.DivaStringUtils
+import aquadx.sega.diva.DIVA_OK
+import aquadx.sega.diva.DivaRepos
+import aquadx.sega.diva.model.StageResultRequest
+import aquadx.sega.diva.model.common.ContestBorder
+import aquadx.sega.diva.model.common.Difficulty
+import aquadx.sega.diva.model.common.Edition
+import aquadx.sega.diva.model.common.SortMode
+import aquadx.sega.diva.model.db.gamedata.Contest
+import aquadx.sega.diva.model.db.userdata.PlayerContest
+import aquadx.sega.diva.util.DivaStringUtils
 import org.springframework.stereotype.Component
 import java.lang.String
 import java.time.LocalDateTime

planet/src/main/kotlin/aquadx/sega/diva/handler/user/PdUnlockHandler.kt

@@ -1,8 +1,8 @@
-package icu.samnyan.aqua.sega.diva.handler.user
+package aquadx.sega.diva.handler.user
 
-import icu.samnyan.aqua.sega.diva.DIVA_OK
-import icu.samnyan.aqua.sega.diva.DivaRepos
-import icu.samnyan.aqua.sega.diva.model.PdUnlockRequest
+import aquadx.sega.diva.DIVA_OK
+import aquadx.sega.diva.DivaRepos
+import aquadx.sega.diva.model.PdUnlockRequest
 import org.springframework.stereotype.Component
 
 @Component

planet/src/main/kotlin/aquadx/sega/diva/handler/user/PreStartHandler.kt

@@ -1,13 +1,13 @@
-package icu.samnyan.aqua.sega.diva.handler.user
+package aquadx.sega.diva.handler.user
 
 import ext.invoke
 import ext.logger
-import icu.samnyan.aqua.sega.diva.DivaRepos
-import icu.samnyan.aqua.sega.diva.model.PreStartRequest
-import icu.samnyan.aqua.sega.diva.model.PreStartResponse
-import icu.samnyan.aqua.sega.diva.model.common.PreStartResult
-import icu.samnyan.aqua.sega.diva.model.common.StartMode
-import icu.samnyan.aqua.sega.diva.model.db.userdata.GameSession
+import aquadx.sega.diva.DivaRepos
+import aquadx.sega.diva.model.PreStartRequest
+import aquadx.sega.diva.model.PreStartResponse
+import aquadx.sega.diva.model.common.PreStartResult
+import aquadx.sega.diva.model.common.StartMode
+import aquadx.sega.diva.model.db.userdata.GameSession
 import org.springframework.stereotype.Component
 import java.time.LocalDateTime
 import java.util.concurrent.ThreadLocalRandom

planet/src/main/kotlin/aquadx/sega/diva/handler/user/SpendCreditHandler.kt

@@ -1,8 +1,8 @@
-package icu.samnyan.aqua.sega.diva.handler.user
+package aquadx.sega.diva.handler.user
 
-import icu.samnyan.aqua.sega.diva.DivaRepos
-import icu.samnyan.aqua.sega.diva.model.SpendCreditRequest
-import icu.samnyan.aqua.sega.diva.model.SpendCreditResponse
+import aquadx.sega.diva.DivaRepos
+import aquadx.sega.diva.model.SpendCreditRequest
+import aquadx.sega.diva.model.SpendCreditResponse
 import org.springframework.stereotype.Component
 
 /**

planet/src/main/kotlin/aquadx/sega/diva/handler/user/StartHandler.kt

@@ -1,15 +1,15 @@
-package icu.samnyan.aqua.sega.diva.handler.user
+package aquadx.sega.diva.handler.user
 
-import icu.samnyan.aqua.sega.diva.DivaRepos
-import icu.samnyan.aqua.sega.diva.model.StartRequest
-import icu.samnyan.aqua.sega.diva.model.StartResponse
-import icu.samnyan.aqua.sega.diva.model.common.*
-import icu.samnyan.aqua.sega.diva.model.common.collection.ClearTally
-import icu.samnyan.aqua.sega.diva.model.db.userdata.GameSession
-import icu.samnyan.aqua.sega.diva.model.db.userdata.PlayerContest
-import icu.samnyan.aqua.sega.diva.model.db.userdata.PlayerProfile
-import icu.samnyan.aqua.sega.diva.model.db.userdata.PlayerPvRecord
-import icu.samnyan.aqua.sega.diva.util.PvRecordDataException
+import aquadx.sega.diva.DivaRepos
+import aquadx.sega.diva.model.StartRequest
+import aquadx.sega.diva.model.StartResponse
+import aquadx.sega.diva.model.common.*
+import aquadx.sega.diva.model.common.collection.ClearTally
+import aquadx.sega.diva.model.db.userdata.GameSession
+import aquadx.sega.diva.model.db.userdata.PlayerContest
+import aquadx.sega.diva.model.db.userdata.PlayerProfile
+import aquadx.sega.diva.model.db.userdata.PlayerPvRecord
+import aquadx.sega.diva.util.PvRecordDataException
 import org.springframework.stereotype.Component
 import java.time.LocalDateTime
 import java.util.*

planet/src/main/kotlin/aquadx/sega/diva/util/DivaMapper.kt

@@ -1,4 +1,4 @@
-package icu.samnyan.aqua.sega.diva.util
+package aquadx.sega.diva.util
 
 import com.fasterxml.jackson.core.json.JsonWriteFeature
 import com.fasterxml.jackson.core.type.TypeReference
@@ -8,9 +8,9 @@ import com.fasterxml.jackson.databind.json.JsonMapper
 import com.fasterxml.jackson.databind.module.SimpleModule
 import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer
 import ext.JDict
-import icu.samnyan.aqua.sega.util.BooleanNumberDeserializer
-import icu.samnyan.aqua.sega.util.BooleanNumberSerializer
-import icu.samnyan.aqua.sega.util.ZonedDateTimeDeserializer
+import aquadx.sega.util.BooleanNumberDeserializer
+import aquadx.sega.util.BooleanNumberSerializer
+import aquadx.sega.util.ZonedDateTimeDeserializer
 import org.springframework.stereotype.Component
 import java.time.LocalDateTime
 import java.time.ZonedDateTime

planet/src/main/kotlin/aquadx/sega/diva/util/DivaUtils.kt

@@ -1,9 +1,9 @@
-package icu.samnyan.aqua.sega.diva.util
+package aquadx.sega.diva.util
 
-import icu.samnyan.aqua.sega.diva.PlayerPvRecordRepository
-import icu.samnyan.aqua.sega.diva.model.common.Edition
-import icu.samnyan.aqua.sega.diva.model.common.LevelInfo
-import icu.samnyan.aqua.sega.diva.model.db.userdata.PlayerProfile
+import aquadx.sega.diva.PlayerPvRecordRepository
+import aquadx.sega.diva.model.common.Edition
+import aquadx.sega.diva.model.common.LevelInfo
+import aquadx.sega.diva.model.db.userdata.PlayerProfile
 import org.springframework.stereotype.Component
 import kotlin.math.roundToInt
 

planet/src/main/kotlin/aquadx/sega/diva/util/Exceptions.kt

@@ -1,4 +1,4 @@
-package icu.samnyan.aqua.sega.diva.util
+package aquadx.sega.diva.util
 
 class PvRecordDataException(message: String?) : RuntimeException(message)
 class SessionNotFoundException : RuntimeException()

planet/src/main/kotlin/aquadx/sega/general/BaseHandler.kt

@@ -1,4 +1,4 @@
-package icu.samnyan.aqua.sega.general
+package aquadx.sega.general
 
 import com.fasterxml.jackson.core.JsonProcessingException
 import ext.*

planet/src/main/kotlin/aquadx/sega/general/GameMusicPopularity.kt

@@ -1,4 +1,4 @@
-package icu.samnyan.aqua.sega.general
+package aquadx.sega.general
 
 import ext.*
 import jakarta.persistence.EntityManager

planet/src/main/kotlin/aquadx/sega/general/dao/CardRepository.kt

@@ -1,6 +1,6 @@
-package icu.samnyan.aqua.sega.general.dao
+package aquadx.sega.general.dao
 
-import icu.samnyan.aqua.sega.general.model.Card
+import aquadx.sega.general.model.Card
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.stereotype.Repository
 

planet/src/main/kotlin/aquadx/sega/general/dao/PropertyEntryRepository.kt

@@ -1,6 +1,6 @@
-package icu.samnyan.aqua.sega.general.dao
+package aquadx.sega.general.dao
 
-import icu.samnyan.aqua.sega.general.model.PropertyEntry
+import aquadx.sega.general.model.PropertyEntry
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.stereotype.Repository
 import java.util.*

planet/src/main/kotlin/aquadx/sega/general/filter/CompressRequestWrapper.kt

@@ -1,4 +1,4 @@
-package icu.samnyan.aqua.sega.general.filter
+package aquadx.sega.general.filter
 
 import jakarta.servlet.ReadListener
 import jakarta.servlet.ServletInputStream

planet/src/main/kotlin/aquadx/sega/general/filter/CompressionFilter.kt

@@ -1,11 +1,11 @@
-package icu.samnyan.aqua.sega.general.filter
+package aquadx.sega.general.filter
 
 import ext.details
 import ext.logger
 import ext.toJson
-import icu.samnyan.aqua.net.components.GeoIP
-import icu.samnyan.aqua.sega.allnet.TokenChecker
-import icu.samnyan.aqua.sega.util.ZLib
+import aquadx.net.components.GeoIP
+import aquadx.sega.allnet.TokenChecker
+import aquadx.sega.util.ZLib
 import jakarta.servlet.FilterChain
 import jakarta.servlet.http.HttpServletRequest
 import jakarta.servlet.http.HttpServletResponse

planet/src/main/kotlin/aquadx/sega/general/model/CardTimestampRepo.kt

@@ -1,4 +1,4 @@
-package icu.samnyan.aqua.sega.general.model
+package aquadx.sega.general.model
 
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.stereotype.Repository

planet/src/main/kotlin/aquadx/sega/general/service/CardService.kt

@@ -1,14 +1,14 @@
-package icu.samnyan.aqua.sega.general.service
+package aquadx.sega.general.service
 
 import ext.Bool
 import ext.Str
 import ext.minus
-import icu.samnyan.aqua.net.Fedy
-import icu.samnyan.aqua.net.db.AquaNetUser
-import icu.samnyan.aqua.sega.general.dao.CardRepository
-import icu.samnyan.aqua.sega.general.model.Card
-import icu.samnyan.aqua.sega.general.model.CardTimestamp
-import icu.samnyan.aqua.sega.general.model.CardTimestampRepo
+import aquadx.net.Fedy
+import aquadx.net.db.AquaNetUser
+import aquadx.sega.general.dao.CardRepository
+import aquadx.sega.general.model.Card
+import aquadx.sega.general.model.CardTimestamp
+import aquadx.sega.general.model.CardTimestampRepo
 import org.springframework.stereotype.Service
 import java.time.Instant
 import java.time.LocalDateTime

planet/src/main/kotlin/aquadx/sega/maimai2/Maimai2Apis.kt

@@ -1,13 +1,15 @@
 @file:Suppress("UNCHECKED_CAST")
 
-package icu.samnyan.aqua.sega.maimai2
+package aquadx.sega.maimai2
 
 import ext.*
-import icu.samnyan.aqua.sega.general.model.CardStatus
-import icu.samnyan.aqua.sega.maimai2.model.UserRivalMusic
-import icu.samnyan.aqua.sega.maimai2.model.UserRivalMusicDetail
-import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2UserKaleidx
-import icu.samnyan.aqua.sega.maimai2.model.userdata.UserRegions
+import ext.get
+import ext.invoke
+import aquadx.sega.general.model.CardStatus
+import aquadx.sega.maimai2.model.UserRivalMusic
+import aquadx.sega.maimai2.model.UserRivalMusicDetail
+import aquadx.sega.maimai2.model.userdata.Mai2UserKaleidx
+import aquadx.sega.maimai2.model.userdata.UserRegions
 import java.time.LocalDate
 import kotlin.random.Random
 

planet/src/main/kotlin/aquadx/sega/maimai2/Maimai2ServletController.kt

@@ -1,18 +1,20 @@
-package icu.samnyan.aqua.sega.maimai2
+package aquadx.sega.maimai2
 
+import aquadx.net.utils.simpleDescribe
+import aquadx.sega.allnet.TokenChecker
+import aquadx.sega.general.BaseHandler
+import aquadx.sega.general.MeowApi
+import aquadx.sega.general.RequestContext
+import aquadx.sega.general.SpecialHandler
+import aquadx.sega.general.toSpecial
+import aquadx.spring.Metrics
 import ext.*
-import icu.samnyan.aqua.net.Fedy
-import icu.samnyan.aqua.net.games.mai2.Maimai2
-import icu.samnyan.aqua.net.utils.ApiException
-import icu.samnyan.aqua.net.utils.simpleDescribe
-import icu.samnyan.aqua.sega.allnet.TokenChecker
-import icu.samnyan.aqua.sega.general.*
-import icu.samnyan.aqua.sega.maimai2.handler.*
-import icu.samnyan.aqua.sega.maimai2.model.Mai2Repos
-import icu.samnyan.aqua.spring.Metrics
+import aquadx.net.games.mai2.Maimai2
+import aquadx.net.utils.ApiException
+import aquadx.sega.general.*
+import aquadx.sega.maimai2.handler.*
+import aquadx.sega.maimai2.model.Mai2Repos
 import jakarta.servlet.http.HttpServletRequest
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.context.annotation.Lazy
 import org.springframework.web.bind.annotation.PathVariable
 import org.springframework.web.bind.annotation.RequestBody
 import org.springframework.web.bind.annotation.RequestMapping

planet/src/main/kotlin/aquadx/sega/maimai2/handler/GetGameRankingHandler.kt

@@ -1,11 +1,11 @@
-package icu.samnyan.aqua.sega.maimai2.handler
+package aquadx.sega.maimai2.handler
 
 import com.querydsl.jpa.impl.JPAQueryFactory
 import ext.logger
 import ext.thread
-import icu.samnyan.aqua.sega.allnet.TokenChecker
-import icu.samnyan.aqua.sega.general.BaseHandler
-import icu.samnyan.aqua.sega.maimai2.model.userdata.QMai2UserPlaylog
+import aquadx.sega.allnet.TokenChecker
+import aquadx.sega.general.BaseHandler
+import aquadx.sega.maimai2.model.userdata.QMai2UserPlaylog
 import org.springframework.scheduling.annotation.Scheduled
 import org.springframework.stereotype.Component
 import java.time.LocalDateTime