diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/Entry.kt b/planet/src/main/kotlin/aquadx/Entry.kt similarity index 86% rename from planet/src/main/kotlin/icu/samnyan/aqua/Entry.kt rename to planet/src/main/kotlin/aquadx/Entry.kt index d08cccee..76a67154 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/Entry.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/net/Bot.kt b/planet/src/main/kotlin/aquadx/net/Bot.kt similarity index 91% rename from planet/src/main/kotlin/icu/samnyan/aqua/net/Bot.kt rename to planet/src/main/kotlin/aquadx/net/Bot.kt index b6d76c06..bc40dd9a 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/net/Bot.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/net/CardController.kt b/planet/src/main/kotlin/aquadx/net/CardController.kt similarity index 90% rename from planet/src/main/kotlin/icu/samnyan/aqua/net/CardController.kt rename to planet/src/main/kotlin/aquadx/net/CardController.kt index e015eb39..139a954b 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/net/CardController.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/net/Fedy.kt b/planet/src/main/kotlin/aquadx/net/Fedy.kt similarity index 93% rename from planet/src/main/kotlin/icu/samnyan/aqua/net/Fedy.kt rename to planet/src/main/kotlin/aquadx/net/Fedy.kt index aaa537fa..05fa3452 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/net/Fedy.kt +++ b/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") diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/net/Frontier.kt b/planet/src/main/kotlin/aquadx/net/Frontier.kt similarity index 92% rename from planet/src/main/kotlin/icu/samnyan/aqua/net/Frontier.kt rename to planet/src/main/kotlin/aquadx/net/Frontier.kt index 50a5d68c..8361059b 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/net/Frontier.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/net/Migrations.kt b/planet/src/main/kotlin/aquadx/net/Migrations.kt similarity index 85% rename from planet/src/main/kotlin/icu/samnyan/aqua/net/Migrations.kt rename to planet/src/main/kotlin/aquadx/net/Migrations.kt index 0b4a1e90..74a776e4 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/net/Migrations.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/net/Safety.kt b/planet/src/main/kotlin/aquadx/net/Safety.kt similarity index 95% rename from planet/src/main/kotlin/icu/samnyan/aqua/net/Safety.kt rename to planet/src/main/kotlin/aquadx/net/Safety.kt index db5f59f4..a5315cf5 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/net/Safety.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/net/SettingsApi.kt b/planet/src/main/kotlin/aquadx/net/SettingsApi.kt similarity index 87% rename from planet/src/main/kotlin/icu/samnyan/aqua/net/SettingsApi.kt rename to planet/src/main/kotlin/aquadx/net/SettingsApi.kt index fb761aa1..299d43aa 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/net/SettingsApi.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/net/UserRegistrar.kt b/planet/src/main/kotlin/aquadx/net/UserRegistrar.kt similarity index 93% rename from planet/src/main/kotlin/icu/samnyan/aqua/net/UserRegistrar.kt rename to planet/src/main/kotlin/aquadx/net/UserRegistrar.kt index 99915057..1fd24cca 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/net/UserRegistrar.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/net/components/Email.kt b/planet/src/main/kotlin/aquadx/net/components/Email.kt similarity index 95% rename from planet/src/main/kotlin/icu/samnyan/aqua/net/components/Email.kt rename to planet/src/main/kotlin/aquadx/net/components/Email.kt index ed4b5916..c0c1756b 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/net/components/Email.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/net/components/GeoIP.kt b/planet/src/main/kotlin/aquadx/net/components/GeoIP.kt similarity index 95% rename from planet/src/main/kotlin/icu/samnyan/aqua/net/components/GeoIP.kt rename to planet/src/main/kotlin/aquadx/net/components/GeoIP.kt index c926b14a..a2057df8 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/net/components/GeoIP.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/net/components/JWT.kt b/planet/src/main/kotlin/aquadx/net/components/JWT.kt similarity index 97% rename from planet/src/main/kotlin/icu/samnyan/aqua/net/components/JWT.kt rename to planet/src/main/kotlin/aquadx/net/components/JWT.kt index 75b829b1..52fb0af4 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/net/components/JWT.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/net/components/Turnstile.kt b/planet/src/main/kotlin/aquadx/net/components/Turnstile.kt similarity index 93% rename from planet/src/main/kotlin/icu/samnyan/aqua/net/components/Turnstile.kt rename to planet/src/main/kotlin/aquadx/net/components/Turnstile.kt index 642cf74b..76841757 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/net/components/Turnstile.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/net/db/AquaEmailConfirmation.kt b/planet/src/main/kotlin/aquadx/net/db/AquaEmailConfirmation.kt similarity index 90% rename from planet/src/main/kotlin/icu/samnyan/aqua/net/db/AquaEmailConfirmation.kt rename to planet/src/main/kotlin/aquadx/net/db/AquaEmailConfirmation.kt index f9e23a92..cb668245 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/net/db/AquaEmailConfirmation.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/net/db/AquaEmailResetPassword.kt b/planet/src/main/kotlin/aquadx/net/db/AquaEmailResetPassword.kt similarity index 90% rename from planet/src/main/kotlin/icu/samnyan/aqua/net/db/AquaEmailResetPassword.kt rename to planet/src/main/kotlin/aquadx/net/db/AquaEmailResetPassword.kt index 4487fb0c..debd03d3 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/net/db/AquaEmailResetPassword.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/net/db/AquaGameOptions.kt b/planet/src/main/kotlin/aquadx/net/db/AquaGameOptions.kt similarity index 84% rename from planet/src/main/kotlin/icu/samnyan/aqua/net/db/AquaGameOptions.kt rename to planet/src/main/kotlin/aquadx/net/db/AquaGameOptions.kt index 93e7ca0b..5f71d81a 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/net/db/AquaGameOptions.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/net/db/AquaNetSession.kt b/planet/src/main/kotlin/aquadx/net/db/AquaNetSession.kt similarity index 90% rename from planet/src/main/kotlin/icu/samnyan/aqua/net/db/AquaNetSession.kt rename to planet/src/main/kotlin/aquadx/net/db/AquaNetSession.kt index f1d38dd2..ce929c56 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/net/db/AquaNetSession.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/net/db/AquaNetUser.kt b/planet/src/main/kotlin/aquadx/net/db/AquaNetUser.kt similarity index 90% rename from planet/src/main/kotlin/icu/samnyan/aqua/net/db/AquaNetUser.kt rename to planet/src/main/kotlin/aquadx/net/db/AquaNetUser.kt index e25640d3..5222fb4c 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/net/db/AquaNetUser.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/net/games/GameApiController.kt b/planet/src/main/kotlin/aquadx/net/games/GameApiController.kt similarity index 97% rename from planet/src/main/kotlin/icu/samnyan/aqua/net/games/GameApiController.kt rename to planet/src/main/kotlin/aquadx/net/games/GameApiController.kt index 100e7175..6083580f 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/net/games/GameApiController.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/net/games/GameHelper.kt b/planet/src/main/kotlin/aquadx/net/games/GameHelper.kt similarity index 96% rename from planet/src/main/kotlin/icu/samnyan/aqua/net/games/GameHelper.kt rename to planet/src/main/kotlin/aquadx/net/games/GameHelper.kt index 59e64270..5f06de87 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/net/games/GameHelper.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/net/games/ImportController.kt b/planet/src/main/kotlin/aquadx/net/games/ImportController.kt similarity index 95% rename from planet/src/main/kotlin/icu/samnyan/aqua/net/games/ImportController.kt rename to planet/src/main/kotlin/aquadx/net/games/ImportController.kt index 248772f8..43ed791c 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/net/games/ImportController.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/net/games/ImportHelper.kt b/planet/src/main/kotlin/aquadx/net/games/ImportHelper.kt similarity index 98% rename from planet/src/main/kotlin/icu/samnyan/aqua/net/games/ImportHelper.kt rename to planet/src/main/kotlin/aquadx/net/games/ImportHelper.kt index 39b6651a..858d50b1 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/net/games/ImportHelper.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/net/games/Models.kt b/planet/src/main/kotlin/aquadx/net/games/Models.kt similarity index 92% rename from planet/src/main/kotlin/icu/samnyan/aqua/net/games/Models.kt rename to planet/src/main/kotlin/aquadx/net/games/Models.kt index fb733773..8d9d2bed 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/net/games/Models.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/net/games/chu3/Chu3Import.kt b/planet/src/main/kotlin/aquadx/net/games/chu3/Chu3Import.kt similarity index 89% rename from planet/src/main/kotlin/icu/samnyan/aqua/net/games/chu3/Chu3Import.kt rename to planet/src/main/kotlin/aquadx/net/games/chu3/Chu3Import.kt index f6292dc0..d9b1337c 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/net/games/chu3/Chu3Import.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/net/games/chu3/Chusan.kt b/planet/src/main/kotlin/aquadx/net/games/chu3/Chusan.kt similarity index 90% rename from planet/src/main/kotlin/icu/samnyan/aqua/net/games/chu3/Chusan.kt rename to planet/src/main/kotlin/aquadx/net/games/chu3/Chusan.kt index 8e12503f..d7db4629 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/net/games/chu3/Chusan.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/net/games/mai2/Mai2Import.kt b/planet/src/main/kotlin/aquadx/net/games/mai2/Mai2Import.kt similarity index 92% rename from planet/src/main/kotlin/icu/samnyan/aqua/net/games/mai2/Mai2Import.kt rename to planet/src/main/kotlin/aquadx/net/games/mai2/Mai2Import.kt index 850d0bb6..62f3a253 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/net/games/mai2/Mai2Import.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/net/games/mai2/Mai2MusicDetailImport.kt b/planet/src/main/kotlin/aquadx/net/games/mai2/Mai2MusicDetailImport.kt similarity index 83% rename from planet/src/main/kotlin/icu/samnyan/aqua/net/games/mai2/Mai2MusicDetailImport.kt rename to planet/src/main/kotlin/aquadx/net/games/mai2/Mai2MusicDetailImport.kt index 180d2b90..6bcbd422 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/net/games/mai2/Mai2MusicDetailImport.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/net/games/mai2/Maimai2.kt b/planet/src/main/kotlin/aquadx/net/games/mai2/Maimai2.kt similarity index 92% rename from planet/src/main/kotlin/icu/samnyan/aqua/net/games/mai2/Maimai2.kt rename to planet/src/main/kotlin/aquadx/net/games/mai2/Maimai2.kt index 1a7fbc47..87f952a2 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/net/games/mai2/Maimai2.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/net/games/ongeki/Ongeki.kt b/planet/src/main/kotlin/aquadx/net/games/ongeki/Ongeki.kt similarity index 80% rename from planet/src/main/kotlin/icu/samnyan/aqua/net/games/ongeki/Ongeki.kt rename to planet/src/main/kotlin/aquadx/net/games/ongeki/Ongeki.kt index e72657bb..15c7608e 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/net/games/ongeki/Ongeki.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/net/games/wacca/Wacca.kt b/planet/src/main/kotlin/aquadx/net/games/wacca/Wacca.kt similarity index 75% rename from planet/src/main/kotlin/icu/samnyan/aqua/net/games/wacca/Wacca.kt rename to planet/src/main/kotlin/aquadx/net/games/wacca/Wacca.kt index 56704046..7fde290c 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/net/games/wacca/Wacca.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/net/transfer/AllNetClient.kt b/planet/src/main/kotlin/aquadx/net/transfer/AllNetClient.kt similarity index 89% rename from planet/src/main/kotlin/icu/samnyan/aqua/net/transfer/AllNetClient.kt rename to planet/src/main/kotlin/aquadx/net/transfer/AllNetClient.kt index 303ee8e4..3c328a9c 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/net/transfer/AllNetClient.kt +++ b/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})") diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/net/transfer/DataBroker.kt b/planet/src/main/kotlin/aquadx/net/transfer/DataBroker.kt similarity index 89% rename from planet/src/main/kotlin/icu/samnyan/aqua/net/transfer/DataBroker.kt rename to planet/src/main/kotlin/aquadx/net/transfer/DataBroker.kt index c52d4b2b..a0a08d8f 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/net/transfer/DataBroker.kt +++ b/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) + class UserMusicWrapper(var userMusicDetailList: List) override fun pull(): String { val (userId, paged) = prePull() diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/net/transfer/TransferApis.kt b/planet/src/main/kotlin/aquadx/net/transfer/TransferApis.kt similarity index 98% rename from planet/src/main/kotlin/icu/samnyan/aqua/net/transfer/TransferApis.kt rename to planet/src/main/kotlin/aquadx/net/transfer/TransferApis.kt index b1f4dd02..551827a3 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/net/transfer/TransferApis.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/net/utils/AquaNetProps.kt b/planet/src/main/kotlin/aquadx/net/utils/AquaNetProps.kt similarity index 90% rename from planet/src/main/kotlin/icu/samnyan/aqua/net/utils/AquaNetProps.kt rename to planet/src/main/kotlin/aquadx/net/utils/AquaNetProps.kt index 6843da21..befcdcfc 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/net/utils/AquaNetProps.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/net/utils/ErrorResponse.kt b/planet/src/main/kotlin/aquadx/net/utils/ErrorResponse.kt similarity index 95% rename from planet/src/main/kotlin/icu/samnyan/aqua/net/utils/ErrorResponse.kt rename to planet/src/main/kotlin/aquadx/net/utils/ErrorResponse.kt index b421b5d2..ecc93aaf 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/net/utils/ErrorResponse.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/net/utils/GameScoring.kt b/planet/src/main/kotlin/aquadx/net/utils/GameScoring.kt similarity index 93% rename from planet/src/main/kotlin/icu/samnyan/aqua/net/utils/GameScoring.kt rename to planet/src/main/kotlin/aquadx/net/utils/GameScoring.kt index dd9aaba6..43855869 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/net/utils/GameScoring.kt +++ b/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( diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/net/utils/PathProps.kt b/planet/src/main/kotlin/aquadx/net/utils/PathProps.kt similarity index 96% rename from planet/src/main/kotlin/icu/samnyan/aqua/net/utils/PathProps.kt rename to planet/src/main/kotlin/aquadx/net/utils/PathProps.kt index 69b2849e..b0553a39 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/net/utils/PathProps.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/aimedb/AimeDB.kt b/planet/src/main/kotlin/aquadx/sega/aimedb/AimeDB.kt similarity index 96% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/aimedb/AimeDB.kt rename to planet/src/main/kotlin/aquadx/sega/aimedb/AimeDB.kt index a24dc034..94dc1d1a 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/aimedb/AimeDB.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/aimedb/AimeDbClient.kt b/planet/src/main/kotlin/aquadx/sega/aimedb/AimeDbClient.kt similarity index 99% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/aimedb/AimeDbClient.kt rename to planet/src/main/kotlin/aquadx/sega/aimedb/AimeDbClient.kt index 28c55704..6649119b 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/aimedb/AimeDbClient.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/aimedb/AimeDbDecoder.kt b/planet/src/main/kotlin/aquadx/sega/aimedb/AimeDbDecoder.kt similarity index 98% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/aimedb/AimeDbDecoder.kt rename to planet/src/main/kotlin/aquadx/sega/aimedb/AimeDbDecoder.kt index fa3ccb6e..b9845ea6 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/aimedb/AimeDbDecoder.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/aimedb/AimeDbEncoder.kt b/planet/src/main/kotlin/aquadx/sega/aimedb/AimeDbEncoder.kt similarity index 93% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/aimedb/AimeDbEncoder.kt rename to planet/src/main/kotlin/aquadx/sega/aimedb/AimeDbEncoder.kt index 3eab687f..a2b30a49 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/aimedb/AimeDbEncoder.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/aimedb/AimeDbEncryption.kt b/planet/src/main/kotlin/aquadx/sega/aimedb/AimeDbEncryption.kt similarity index 96% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/aimedb/AimeDbEncryption.kt rename to planet/src/main/kotlin/aquadx/sega/aimedb/AimeDbEncryption.kt index ad8a2bf4..1a4bd98c 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/aimedb/AimeDbEncryption.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/aimedb/AimeDbServer.kt b/planet/src/main/kotlin/aquadx/sega/aimedb/AimeDbServer.kt similarity index 98% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/aimedb/AimeDbServer.kt rename to planet/src/main/kotlin/aquadx/sega/aimedb/AimeDbServer.kt index 9e19ec41..a2298e0a 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/aimedb/AimeDbServer.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/allnet/AllNet.kt b/planet/src/main/kotlin/aquadx/sega/allnet/AllNet.kt similarity index 97% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/allnet/AllNet.kt rename to planet/src/main/kotlin/aquadx/sega/allnet/AllNet.kt index 2240772f..19a2a40e 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/allnet/AllNet.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/allnet/AllNetBillingDecoder.kt b/planet/src/main/kotlin/aquadx/sega/allnet/AllNetBillingDecoder.kt similarity index 95% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/allnet/AllNetBillingDecoder.kt rename to planet/src/main/kotlin/aquadx/sega/allnet/AllNetBillingDecoder.kt index a24c5087..7e38c7df 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/allnet/AllNetBillingDecoder.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/allnet/AllNetSecure.kt b/planet/src/main/kotlin/aquadx/sega/allnet/AllNetSecure.kt similarity index 94% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/allnet/AllNetSecure.kt rename to planet/src/main/kotlin/aquadx/sega/allnet/AllNetSecure.kt index 21f420f1..53830aac 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/allnet/AllNetSecure.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/allnet/Keychip.kt b/planet/src/main/kotlin/aquadx/sega/allnet/Keychip.kt similarity index 88% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/allnet/Keychip.kt rename to planet/src/main/kotlin/aquadx/sega/allnet/Keychip.kt index 02b6ccf9..2319ad96 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/allnet/Keychip.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/allnet/KeychipSession.kt b/planet/src/main/kotlin/aquadx/sega/allnet/KeychipSession.kt similarity index 95% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/allnet/KeychipSession.kt rename to planet/src/main/kotlin/aquadx/sega/allnet/KeychipSession.kt index d4d54066..7b007c3b 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/allnet/KeychipSession.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/billing/Billing.kt b/planet/src/main/kotlin/aquadx/sega/billing/Billing.kt similarity index 97% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/billing/Billing.kt rename to planet/src/main/kotlin/aquadx/sega/billing/Billing.kt index bf12e1cc..25f7ddf6 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/billing/Billing.kt +++ b/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") diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/cardmaker/CardMakerController.kt b/planet/src/main/kotlin/aquadx/sega/cardmaker/CardMakerController.kt similarity index 96% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/cardmaker/CardMakerController.kt rename to planet/src/main/kotlin/aquadx/sega/cardmaker/CardMakerController.kt index 489b07cb..f8710e50 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/cardmaker/CardMakerController.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/cardmaker/CardMakerControllerAdvice.kt b/planet/src/main/kotlin/aquadx/sega/cardmaker/CardMakerControllerAdvice.kt similarity index 89% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/cardmaker/CardMakerControllerAdvice.kt rename to planet/src/main/kotlin/aquadx/sega/cardmaker/CardMakerControllerAdvice.kt index 17a882a0..70a85f9d 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/cardmaker/CardMakerControllerAdvice.kt +++ b/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() diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/chusan/ChusanController.kt b/planet/src/main/kotlin/aquadx/sega/chusan/ChusanController.kt similarity index 81% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/chusan/ChusanController.kt rename to planet/src/main/kotlin/aquadx/sega/chusan/ChusanController.kt index 1a9b4b48..a8d25f2c 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/chusan/ChusanController.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/chusan/ChusanData.kt b/planet/src/main/kotlin/aquadx/sega/chusan/ChusanData.kt similarity index 98% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/chusan/ChusanData.kt rename to planet/src/main/kotlin/aquadx/sega/chusan/ChusanData.kt index 6a84d554..a86e59c5 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/chusan/ChusanData.kt +++ b/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 { diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/chusan/ChusanProps.kt b/planet/src/main/kotlin/aquadx/sega/chusan/ChusanProps.kt similarity index 90% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/chusan/ChusanProps.kt rename to planet/src/main/kotlin/aquadx/sega/chusan/ChusanProps.kt index c94b0786..c72be764 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/chusan/ChusanProps.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/chusan/ChusanVersionHelper.kt b/planet/src/main/kotlin/aquadx/sega/chusan/ChusanVersionHelper.kt similarity index 88% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/chusan/ChusanVersionHelper.kt rename to planet/src/main/kotlin/aquadx/sega/chusan/ChusanVersionHelper.kt index d851c504..0793f79b 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/chusan/ChusanVersionHelper.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/chusan/handler/ChusanApis.kt b/planet/src/main/kotlin/aquadx/sega/chusan/handler/ChusanApis.kt similarity index 97% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/chusan/handler/ChusanApis.kt rename to planet/src/main/kotlin/aquadx/sega/chusan/handler/ChusanApis.kt index 72bb8881..ea4c9f10 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/chusan/handler/ChusanApis.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/chusan/handler/ChusanCMApis.kt b/planet/src/main/kotlin/aquadx/sega/chusan/handler/ChusanCMApis.kt similarity index 92% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/chusan/handler/ChusanCMApis.kt rename to planet/src/main/kotlin/aquadx/sega/chusan/handler/ChusanCMApis.kt index bf748a65..0fe0e9a4 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/chusan/handler/ChusanCMApis.kt +++ b/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() { diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/chusan/handler/ChusanMatchingApis.kt b/planet/src/main/kotlin/aquadx/sega/chusan/handler/ChusanMatchingApis.kt similarity index 89% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/chusan/handler/ChusanMatchingApis.kt rename to planet/src/main/kotlin/aquadx/sega/chusan/handler/ChusanMatchingApis.kt index 79bf6647..d1432189 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/chusan/handler/ChusanMatchingApis.kt +++ b/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() { diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/chusan/handler/ChusanUpsertApis.kt b/planet/src/main/kotlin/aquadx/sega/chusan/handler/ChusanUpsertApis.kt similarity index 96% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/chusan/handler/ChusanUpsertApis.kt rename to planet/src/main/kotlin/aquadx/sega/chusan/handler/ChusanUpsertApis.kt index 30bc7091..ffd304e9 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/chusan/handler/ChusanUpsertApis.kt +++ b/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") diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/Chu3Repos.kt b/planet/src/main/kotlin/aquadx/sega/chusan/model/Chu3Repos.kt similarity index 93% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/Chu3Repos.kt rename to planet/src/main/kotlin/aquadx/sega/chusan/model/Chu3Repos.kt index ed432420..091a295d 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/Chu3Repos.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/DivaController.kt b/planet/src/main/kotlin/aquadx/sega/diva/DivaController.kt similarity index 91% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/DivaController.kt rename to planet/src/main/kotlin/aquadx/sega/diva/DivaController.kt index 7e349215..71e9da81 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/DivaController.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/DivaRepos.kt b/planet/src/main/kotlin/aquadx/sega/diva/DivaRepos.kt similarity index 92% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/DivaRepos.kt rename to planet/src/main/kotlin/aquadx/sega/diva/DivaRepos.kt index c1d19284..f8011992 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/DivaRepos.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/DivaServices.kt b/planet/src/main/kotlin/aquadx/sega/diva/DivaServices.kt similarity index 87% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/DivaServices.kt rename to planet/src/main/kotlin/aquadx/sega/diva/DivaServices.kt index d54d401c..4d776c2e 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/DivaServices.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/InitHandlers.kt b/planet/src/main/kotlin/aquadx/sega/diva/handler/InitHandlers.kt similarity index 91% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/InitHandlers.kt rename to planet/src/main/kotlin/aquadx/sega/diva/handler/InitHandlers.kt index eb650cbc..c9809596 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/InitHandlers.kt +++ b/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.* diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/card/CardProcedureHandler.kt b/planet/src/main/kotlin/aquadx/sega/diva/handler/card/CardProcedureHandler.kt similarity index 84% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/card/CardProcedureHandler.kt rename to planet/src/main/kotlin/aquadx/sega/diva/handler/card/CardProcedureHandler.kt index 4619a11e..fb0f97b5 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/card/CardProcedureHandler.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/card/ChangeNameHandler.kt b/planet/src/main/kotlin/aquadx/sega/diva/handler/card/ChangeNameHandler.kt similarity index 68% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/card/ChangeNameHandler.kt rename to planet/src/main/kotlin/aquadx/sega/diva/handler/card/ChangeNameHandler.kt index c98b35f6..7fbb19d8 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/card/ChangeNameHandler.kt +++ b/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 /** diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/card/ChangePasswdHandler.kt b/planet/src/main/kotlin/aquadx/sega/diva/handler/card/ChangePasswdHandler.kt similarity index 64% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/card/ChangePasswdHandler.kt rename to planet/src/main/kotlin/aquadx/sega/diva/handler/card/ChangePasswdHandler.kt index d55193ac..c668f00b 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/card/ChangePasswdHandler.kt +++ b/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 /** diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/card/RegistrationHandler.kt b/planet/src/main/kotlin/aquadx/sega/diva/handler/card/RegistrationHandler.kt similarity index 67% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/card/RegistrationHandler.kt rename to planet/src/main/kotlin/aquadx/sega/diva/handler/card/RegistrationHandler.kt index fbcd4bcc..6dca5795 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/card/RegistrationHandler.kt +++ b/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 /** diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/databank/ContestInfoHandler.kt b/planet/src/main/kotlin/aquadx/sega/diva/handler/databank/ContestInfoHandler.kt similarity index 71% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/databank/ContestInfoHandler.kt rename to planet/src/main/kotlin/aquadx/sega/diva/handler/databank/ContestInfoHandler.kt index cc0976d2..30b63853 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/databank/ContestInfoHandler.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/databank/FestaInfoHandler.kt b/planet/src/main/kotlin/aquadx/sega/diva/handler/databank/FestaInfoHandler.kt similarity index 72% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/databank/FestaInfoHandler.kt rename to planet/src/main/kotlin/aquadx/sega/diva/handler/databank/FestaInfoHandler.kt index 2dbadb17..c8588f49 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/databank/FestaInfoHandler.kt +++ b/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 /** diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/databank/NvRankingHandler.kt b/planet/src/main/kotlin/aquadx/sega/diva/handler/databank/NvRankingHandler.kt similarity index 62% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/databank/NvRankingHandler.kt rename to planet/src/main/kotlin/aquadx/sega/diva/handler/databank/NvRankingHandler.kt index 3ebe8ab6..4bcc336b 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/databank/NvRankingHandler.kt +++ b/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 /** diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/databank/PsRankingHandler.kt b/planet/src/main/kotlin/aquadx/sega/diva/handler/databank/PsRankingHandler.kt similarity index 85% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/databank/PsRankingHandler.kt rename to planet/src/main/kotlin/aquadx/sega/diva/handler/databank/PsRankingHandler.kt index 066e63e6..3f645341 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/databank/PsRankingHandler.kt +++ b/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.* diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/databank/PvListHandler.kt b/planet/src/main/kotlin/aquadx/sega/diva/handler/databank/PvListHandler.kt similarity index 82% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/databank/PvListHandler.kt rename to planet/src/main/kotlin/aquadx/sega/diva/handler/databank/PvListHandler.kt index 6814fb60..7512633d 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/databank/PvListHandler.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/databank/ShopCatalogHandler.kt b/planet/src/main/kotlin/aquadx/sega/diva/handler/databank/ShopCatalogHandler.kt similarity index 64% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/databank/ShopCatalogHandler.kt rename to planet/src/main/kotlin/aquadx/sega/diva/handler/databank/ShopCatalogHandler.kt index b7de67b2..07dc7f82 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/databank/ShopCatalogHandler.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/ingame/BuyCstmzItmHandler.kt b/planet/src/main/kotlin/aquadx/sega/diva/handler/ingame/BuyCstmzItmHandler.kt similarity index 77% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/ingame/BuyCstmzItmHandler.kt rename to planet/src/main/kotlin/aquadx/sega/diva/handler/ingame/BuyCstmzItmHandler.kt index 6efb805a..2d2339c5 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/ingame/BuyCstmzItmHandler.kt +++ b/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 /** diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/ingame/BuyModuleHandler.kt b/planet/src/main/kotlin/aquadx/sega/diva/handler/ingame/BuyModuleHandler.kt similarity index 78% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/ingame/BuyModuleHandler.kt rename to planet/src/main/kotlin/aquadx/sega/diva/handler/ingame/BuyModuleHandler.kt index 64d50aff..6c26d6c9 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/ingame/BuyModuleHandler.kt +++ b/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 /** diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/ingame/GetPvPdHandler.kt b/planet/src/main/kotlin/aquadx/sega/diva/handler/ingame/GetPvPdHandler.kt similarity index 88% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/ingame/GetPvPdHandler.kt rename to planet/src/main/kotlin/aquadx/sega/diva/handler/ingame/GetPvPdHandler.kt index bda9b7cd..4d2356cf 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/ingame/GetPvPdHandler.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/ingame/ShopExitHandler.kt b/planet/src/main/kotlin/aquadx/sega/diva/handler/ingame/ShopExitHandler.kt similarity index 79% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/ingame/ShopExitHandler.kt rename to planet/src/main/kotlin/aquadx/sega/diva/handler/ingame/ShopExitHandler.kt index 9afd8907..2c855e2c 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/ingame/ShopExitHandler.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/ingame/StageResultHandler.kt b/planet/src/main/kotlin/aquadx/sega/diva/handler/ingame/StageResultHandler.kt similarity index 97% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/ingame/StageResultHandler.kt rename to planet/src/main/kotlin/aquadx/sega/diva/handler/ingame/StageResultHandler.kt index 5f79830d..69da316e 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/ingame/StageResultHandler.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/ingame/StageStartHandler.kt b/planet/src/main/kotlin/aquadx/sega/diva/handler/ingame/StageStartHandler.kt similarity index 85% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/ingame/StageStartHandler.kt rename to planet/src/main/kotlin/aquadx/sega/diva/handler/ingame/StageStartHandler.kt index f8392a3f..37325ec0 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/ingame/StageStartHandler.kt +++ b/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 /** diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/ingame/StoreSsHandler.kt b/planet/src/main/kotlin/aquadx/sega/diva/handler/ingame/StoreSsHandler.kt similarity index 78% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/ingame/StoreSsHandler.kt rename to planet/src/main/kotlin/aquadx/sega/diva/handler/ingame/StoreSsHandler.kt index 1cc9ce52..28337ae9 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/ingame/StoreSsHandler.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/user/EndHandler.kt b/planet/src/main/kotlin/aquadx/sega/diva/handler/user/EndHandler.kt similarity index 83% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/user/EndHandler.kt rename to planet/src/main/kotlin/aquadx/sega/diva/handler/user/EndHandler.kt index 14d45e86..6aa3f8e4 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/user/EndHandler.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/user/PdUnlockHandler.kt b/planet/src/main/kotlin/aquadx/sega/diva/handler/user/PdUnlockHandler.kt similarity index 59% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/user/PdUnlockHandler.kt rename to planet/src/main/kotlin/aquadx/sega/diva/handler/user/PdUnlockHandler.kt index 332d3d80..b82c57cc 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/user/PdUnlockHandler.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/user/PreStartHandler.kt b/planet/src/main/kotlin/aquadx/sega/diva/handler/user/PreStartHandler.kt similarity index 83% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/user/PreStartHandler.kt rename to planet/src/main/kotlin/aquadx/sega/diva/handler/user/PreStartHandler.kt index e6810401..9a6c428c 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/user/PreStartHandler.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/user/SpendCreditHandler.kt b/planet/src/main/kotlin/aquadx/sega/diva/handler/user/SpendCreditHandler.kt similarity index 74% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/user/SpendCreditHandler.kt rename to planet/src/main/kotlin/aquadx/sega/diva/handler/user/SpendCreditHandler.kt index 748a1b3c..2b457dde 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/user/SpendCreditHandler.kt +++ b/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 /** diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/user/StartHandler.kt b/planet/src/main/kotlin/aquadx/sega/diva/handler/user/StartHandler.kt similarity index 90% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/user/StartHandler.kt rename to planet/src/main/kotlin/aquadx/sega/diva/handler/user/StartHandler.kt index 79af9090..167a0b9e 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/handler/user/StartHandler.kt +++ b/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.* diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/util/DivaMapper.kt b/planet/src/main/kotlin/aquadx/sega/diva/util/DivaMapper.kt similarity index 89% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/util/DivaMapper.kt rename to planet/src/main/kotlin/aquadx/sega/diva/util/DivaMapper.kt index f4f5bec4..a5aa4975 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/util/DivaMapper.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/util/DivaUtils.kt b/planet/src/main/kotlin/aquadx/sega/diva/util/DivaUtils.kt similarity index 69% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/util/DivaUtils.kt rename to planet/src/main/kotlin/aquadx/sega/diva/util/DivaUtils.kt index 0bf707e1..501af977 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/util/DivaUtils.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/util/Exceptions.kt b/planet/src/main/kotlin/aquadx/sega/diva/util/Exceptions.kt similarity index 81% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/util/Exceptions.kt rename to planet/src/main/kotlin/aquadx/sega/diva/util/Exceptions.kt index d4aaced6..5f37895f 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/diva/util/Exceptions.kt +++ b/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() diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/general/BaseHandler.kt b/planet/src/main/kotlin/aquadx/sega/general/BaseHandler.kt similarity index 99% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/general/BaseHandler.kt rename to planet/src/main/kotlin/aquadx/sega/general/BaseHandler.kt index 6bda26e1..6fddbb11 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/general/BaseHandler.kt +++ b/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.* diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/general/GameMusicPopularity.kt b/planet/src/main/kotlin/aquadx/sega/general/GameMusicPopularity.kt similarity index 97% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/general/GameMusicPopularity.kt rename to planet/src/main/kotlin/aquadx/sega/general/GameMusicPopularity.kt index 91a33ac9..e6a0cc95 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/general/GameMusicPopularity.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/general/dao/CardRepository.kt b/planet/src/main/kotlin/aquadx/sega/general/dao/CardRepository.kt similarity index 79% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/general/dao/CardRepository.kt rename to planet/src/main/kotlin/aquadx/sega/general/dao/CardRepository.kt index 538afe78..2ed6b90e 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/general/dao/CardRepository.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/general/dao/PropertyEntryRepository.kt b/planet/src/main/kotlin/aquadx/sega/general/dao/PropertyEntryRepository.kt similarity index 77% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/general/dao/PropertyEntryRepository.kt rename to planet/src/main/kotlin/aquadx/sega/general/dao/PropertyEntryRepository.kt index 7d928488..899162fc 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/general/dao/PropertyEntryRepository.kt +++ b/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.* diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/general/filter/CompressRequestWrapper.kt b/planet/src/main/kotlin/aquadx/sega/general/filter/CompressRequestWrapper.kt similarity index 95% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/general/filter/CompressRequestWrapper.kt rename to planet/src/main/kotlin/aquadx/sega/general/filter/CompressRequestWrapper.kt index 5dcd44c5..9afeb97f 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/general/filter/CompressRequestWrapper.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/general/filter/CompressionFilter.kt b/planet/src/main/kotlin/aquadx/sega/general/filter/CompressionFilter.kt similarity index 94% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/general/filter/CompressionFilter.kt rename to planet/src/main/kotlin/aquadx/sega/general/filter/CompressionFilter.kt index a4242e2c..398c38fc 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/general/filter/CompressionFilter.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/general/model/CardTimestampRepo.kt b/planet/src/main/kotlin/aquadx/sega/general/model/CardTimestampRepo.kt similarity index 87% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/general/model/CardTimestampRepo.kt rename to planet/src/main/kotlin/aquadx/sega/general/model/CardTimestampRepo.kt index d309bb51..3a36bfe2 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/general/model/CardTimestampRepo.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/general/service/CardService.kt b/planet/src/main/kotlin/aquadx/sega/general/service/CardService.kt similarity index 92% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/general/service/CardService.kt rename to planet/src/main/kotlin/aquadx/sega/general/service/CardService.kt index d46f3c99..c811b499 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/general/service/CardService.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/Maimai2Apis.kt b/planet/src/main/kotlin/aquadx/sega/maimai2/Maimai2Apis.kt similarity index 97% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/Maimai2Apis.kt rename to planet/src/main/kotlin/aquadx/sega/maimai2/Maimai2Apis.kt index f670fdf5..1597c002 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/Maimai2Apis.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/Maimai2ServletController.kt b/planet/src/main/kotlin/aquadx/sega/maimai2/Maimai2ServletController.kt similarity index 88% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/Maimai2ServletController.kt rename to planet/src/main/kotlin/aquadx/sega/maimai2/Maimai2ServletController.kt index 696233ad..82843677 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/Maimai2ServletController.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/handler/GetGameRankingHandler.kt b/planet/src/main/kotlin/aquadx/sega/maimai2/handler/GetGameRankingHandler.kt similarity index 92% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/handler/GetGameRankingHandler.kt rename to planet/src/main/kotlin/aquadx/sega/maimai2/handler/GetGameRankingHandler.kt index 919e1c80..b74b11bc 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/handler/GetGameRankingHandler.kt +++ b/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 diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/handler/GetUserCharacterHandler.kt b/planet/src/main/kotlin/aquadx/sega/maimai2/handler/GetUserCharacterHandler.kt similarity index 77% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/handler/GetUserCharacterHandler.kt rename to planet/src/main/kotlin/aquadx/sega/maimai2/handler/GetUserCharacterHandler.kt index 52dcf0fc..6df93c99 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/handler/GetUserCharacterHandler.kt +++ b/planet/src/main/kotlin/aquadx/sega/maimai2/handler/GetUserCharacterHandler.kt @@ -1,14 +1,14 @@ -package icu.samnyan.aqua.sega.maimai2.handler +package aquadx.sega.maimai2.handler import ext.int import ext.logger import ext.mapApply -import icu.samnyan.aqua.net.games.mai2.Maimai2 -import icu.samnyan.aqua.sega.general.BaseHandler -import icu.samnyan.aqua.sega.general.dao.CardRepository -import icu.samnyan.aqua.sega.maimai2.model.Mai2Repos -import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2ItemKind -import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2UserCharacter +import aquadx.net.games.mai2.Maimai2 +import aquadx.sega.general.BaseHandler +import aquadx.sega.general.dao.CardRepository +import aquadx.sega.maimai2.model.Mai2Repos +import aquadx.sega.maimai2.model.userdata.Mai2ItemKind +import aquadx.sega.maimai2.model.userdata.Mai2UserCharacter import org.springframework.stereotype.Component @Component("Maimai2GetUserCharacterHandler") diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/handler/GetUserFavoriteItemHandler.kt b/planet/src/main/kotlin/aquadx/sega/maimai2/handler/GetUserFavoriteItemHandler.kt similarity index 88% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/handler/GetUserFavoriteItemHandler.kt rename to planet/src/main/kotlin/aquadx/sega/maimai2/handler/GetUserFavoriteItemHandler.kt index 94fc6b0e..54ffee55 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/handler/GetUserFavoriteItemHandler.kt +++ b/planet/src/main/kotlin/aquadx/sega/maimai2/handler/GetUserFavoriteItemHandler.kt @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.maimai2.handler +package aquadx.sega.maimai2.handler -import icu.samnyan.aqua.sega.general.BaseHandler -import icu.samnyan.aqua.sega.maimai2.model.Mai2Repos +import aquadx.sega.general.BaseHandler +import aquadx.sega.maimai2.model.Mai2Repos import org.springframework.stereotype.Component @Component("Maimai2GetUserFavoriteItemHandler") diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/handler/GetUserItemHandler.kt b/planet/src/main/kotlin/aquadx/sega/maimai2/handler/GetUserItemHandler.kt similarity index 89% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/handler/GetUserItemHandler.kt rename to planet/src/main/kotlin/aquadx/sega/maimai2/handler/GetUserItemHandler.kt index 7bae9966..9d3bec8f 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/handler/GetUserItemHandler.kt +++ b/planet/src/main/kotlin/aquadx/sega/maimai2/handler/GetUserItemHandler.kt @@ -1,11 +1,11 @@ -package icu.samnyan.aqua.sega.maimai2.handler +package aquadx.sega.maimai2.handler import ext.logger -import icu.samnyan.aqua.net.games.mai2.Maimai2 -import icu.samnyan.aqua.sega.general.BaseHandler -import icu.samnyan.aqua.sega.general.dao.CardRepository -import icu.samnyan.aqua.sega.maimai2.model.Mai2Repos -import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2ItemKind +import aquadx.net.games.mai2.Maimai2 +import aquadx.sega.general.BaseHandler +import aquadx.sega.general.dao.CardRepository +import aquadx.sega.maimai2.model.Mai2Repos +import aquadx.sega.maimai2.model.userdata.Mai2ItemKind import org.springframework.stereotype.Component /** diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/handler/GetUserPortraitHandler.kt b/planet/src/main/kotlin/aquadx/sega/maimai2/handler/GetUserPortraitHandler.kt similarity index 87% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/handler/GetUserPortraitHandler.kt rename to planet/src/main/kotlin/aquadx/sega/maimai2/handler/GetUserPortraitHandler.kt index 9dc9e400..2beefd57 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/handler/GetUserPortraitHandler.kt +++ b/planet/src/main/kotlin/aquadx/sega/maimai2/handler/GetUserPortraitHandler.kt @@ -1,11 +1,10 @@ -package icu.samnyan.aqua.sega.maimai2.handler +package aquadx.sega.maimai2.handler -import ext.invoke import ext.logger -import icu.samnyan.aqua.net.utils.PathProps -import icu.samnyan.aqua.sega.general.BaseHandler -import icu.samnyan.aqua.sega.general.dao.CardRepository -import icu.samnyan.aqua.sega.maimai2.model.request.Mai2UserPortrait +import aquadx.net.utils.PathProps +import aquadx.sega.general.BaseHandler +import aquadx.sega.general.dao.CardRepository +import aquadx.sega.maimai2.model.request.Mai2UserPortrait import org.springframework.beans.factory.annotation.Value import org.springframework.security.crypto.codec.Utf8 import org.springframework.stereotype.Component diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/handler/GetUserRatingHandler.kt b/planet/src/main/kotlin/aquadx/sega/maimai2/handler/GetUserRatingHandler.kt similarity index 81% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/handler/GetUserRatingHandler.kt rename to planet/src/main/kotlin/aquadx/sega/maimai2/handler/GetUserRatingHandler.kt index a8a1814d..a83a3ebc 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/handler/GetUserRatingHandler.kt +++ b/planet/src/main/kotlin/aquadx/sega/maimai2/handler/GetUserRatingHandler.kt @@ -1,12 +1,11 @@ -package icu.samnyan.aqua.sega.maimai2.handler +package aquadx.sega.maimai2.handler -import ext.invoke -import icu.samnyan.aqua.sega.general.BaseHandler -import icu.samnyan.aqua.sega.maimai2.model.Mai2Repos -import icu.samnyan.aqua.sega.maimai2.model.UserRating -import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2UserRate -import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2UserUdemae -import icu.samnyan.aqua.sega.util.BasicMapper +import aquadx.sega.general.BaseHandler +import aquadx.sega.maimai2.model.Mai2Repos +import aquadx.sega.maimai2.model.UserRating +import aquadx.sega.maimai2.model.userdata.Mai2UserRate +import aquadx.sega.maimai2.model.userdata.Mai2UserUdemae +import aquadx.sega.util.BasicMapper import org.springframework.stereotype.Component /** diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/handler/UploadUserPhotoHandler.kt b/planet/src/main/kotlin/aquadx/sega/maimai2/handler/UploadUserPhotoHandler.kt similarity index 88% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/handler/UploadUserPhotoHandler.kt rename to planet/src/main/kotlin/aquadx/sega/maimai2/handler/UploadUserPhotoHandler.kt index 194edb91..e426e48b 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/handler/UploadUserPhotoHandler.kt +++ b/planet/src/main/kotlin/aquadx/sega/maimai2/handler/UploadUserPhotoHandler.kt @@ -1,9 +1,9 @@ -package icu.samnyan.aqua.sega.maimai2.handler +package aquadx.sega.maimai2.handler import ext.* -import icu.samnyan.aqua.sega.general.BaseHandler -import icu.samnyan.aqua.sega.maimai2.model.request.Mai2UserPhoto -import icu.samnyan.aqua.sega.util.BasicMapper +import aquadx.sega.general.BaseHandler +import aquadx.sega.maimai2.model.request.Mai2UserPhoto +import aquadx.sega.util.BasicMapper import org.springframework.stereotype.Component import java.io.IOException import java.nio.file.Files diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/handler/UploadUserPlaylogHandler.kt b/planet/src/main/kotlin/aquadx/sega/maimai2/handler/UploadUserPlaylogHandler.kt similarity index 86% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/handler/UploadUserPlaylogHandler.kt rename to planet/src/main/kotlin/aquadx/sega/maimai2/handler/UploadUserPlaylogHandler.kt index 98267e1b..af81bac9 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/handler/UploadUserPlaylogHandler.kt +++ b/planet/src/main/kotlin/aquadx/sega/maimai2/handler/UploadUserPlaylogHandler.kt @@ -1,17 +1,17 @@ -package icu.samnyan.aqua.sega.maimai2.handler +package aquadx.sega.maimai2.handler import ext.logger import ext.long import ext.millis import ext.parsing -import icu.samnyan.aqua.sega.allnet.TokenChecker -import icu.samnyan.aqua.sega.general.BaseHandler -import icu.samnyan.aqua.sega.general.service.CardService -import icu.samnyan.aqua.sega.maimai2.model.Mai2UserDataRepo -import icu.samnyan.aqua.sega.maimai2.model.Mai2UserPlaylogRepo -import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2UserPlaylog -import icu.samnyan.aqua.sega.util.BasicMapper -import icu.samnyan.aqua.spring.Metrics +import aquadx.sega.allnet.TokenChecker +import aquadx.sega.general.BaseHandler +import aquadx.sega.general.service.CardService +import aquadx.sega.maimai2.model.Mai2UserDataRepo +import aquadx.sega.maimai2.model.Mai2UserPlaylogRepo +import aquadx.sega.maimai2.model.userdata.Mai2UserPlaylog +import aquadx.sega.util.BasicMapper +import aquadx.spring.Metrics import org.springframework.scheduling.annotation.Scheduled import org.springframework.stereotype.Component diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/handler/UploadUserPortraitHandler.kt b/planet/src/main/kotlin/aquadx/sega/maimai2/handler/UploadUserPortraitHandler.kt similarity index 90% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/handler/UploadUserPortraitHandler.kt rename to planet/src/main/kotlin/aquadx/sega/maimai2/handler/UploadUserPortraitHandler.kt index 2b70a110..3efd11a6 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/handler/UploadUserPortraitHandler.kt +++ b/planet/src/main/kotlin/aquadx/sega/maimai2/handler/UploadUserPortraitHandler.kt @@ -1,13 +1,13 @@ -package icu.samnyan.aqua.sega.maimai2.handler +package aquadx.sega.maimai2.handler import ext.div import ext.logger import ext.parsing import ext.path -import icu.samnyan.aqua.net.utils.PathProps -import icu.samnyan.aqua.sega.general.BaseHandler -import icu.samnyan.aqua.sega.maimai2.model.request.Mai2UserPortrait -import icu.samnyan.aqua.sega.util.BasicMapper +import aquadx.net.utils.PathProps +import aquadx.sega.general.BaseHandler +import aquadx.sega.maimai2.model.request.Mai2UserPortrait +import aquadx.sega.util.BasicMapper import org.springframework.beans.factory.annotation.Value import org.springframework.stereotype.Component import java.io.IOException diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/handler/UpsertUserAllHandler.kt b/planet/src/main/kotlin/aquadx/sega/maimai2/handler/UpsertUserAllHandler.kt similarity index 92% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/handler/UpsertUserAllHandler.kt rename to planet/src/main/kotlin/aquadx/sega/maimai2/handler/UpsertUserAllHandler.kt index 5c5ad944..856c2823 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/handler/UpsertUserAllHandler.kt +++ b/planet/src/main/kotlin/aquadx/sega/maimai2/handler/UpsertUserAllHandler.kt @@ -1,19 +1,19 @@ -package icu.samnyan.aqua.sega.maimai2.handler +package aquadx.sega.maimai2.handler import com.fasterxml.jackson.core.JsonProcessingException import ext.mapApply import ext.minus import ext.unique -import icu.samnyan.aqua.sega.general.BaseHandler -import icu.samnyan.aqua.sega.general.model.CardStatus -import icu.samnyan.aqua.sega.general.service.CardService -import icu.samnyan.aqua.sega.maimai2.handler.UploadUserPlaylogHandler.Companion.playBacklog -import icu.samnyan.aqua.sega.maimai2.model.Mai2Repos -import icu.samnyan.aqua.sega.maimai2.model.request.Mai2UpsertUserAll -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.Mai2UserRate -import icu.samnyan.aqua.sega.util.BasicMapper +import aquadx.sega.general.BaseHandler +import aquadx.sega.general.model.CardStatus +import aquadx.sega.general.service.CardService +import aquadx.sega.maimai2.handler.UploadUserPlaylogHandler.Companion.playBacklog +import aquadx.sega.maimai2.model.Mai2Repos +import aquadx.sega.maimai2.model.request.Mai2UpsertUserAll +import aquadx.sega.maimai2.model.userdata.Mai2UserDetail +import aquadx.sega.maimai2.model.userdata.Mai2UserGeneralData +import aquadx.sega.maimai2.model.userdata.Mai2UserRate +import aquadx.sega.util.BasicMapper import org.slf4j.LoggerFactory import org.springframework.stereotype.Component diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/handler/UpsertUserPrintHandler.kt b/planet/src/main/kotlin/aquadx/sega/maimai2/handler/UpsertUserPrintHandler.kt similarity index 85% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/handler/UpsertUserPrintHandler.kt rename to planet/src/main/kotlin/aquadx/sega/maimai2/handler/UpsertUserPrintHandler.kt index c12ffa5b..eda011c7 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/handler/UpsertUserPrintHandler.kt +++ b/planet/src/main/kotlin/aquadx/sega/maimai2/handler/UpsertUserPrintHandler.kt @@ -1,14 +1,13 @@ -package icu.samnyan.aqua.sega.maimai2.handler +package aquadx.sega.maimai2.handler -import ext.invoke import ext.logger import ext.long import ext.parsing -import icu.samnyan.aqua.sega.general.BaseHandler -import icu.samnyan.aqua.sega.general.service.CardService -import icu.samnyan.aqua.sega.maimai2.model.Mai2Repos -import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2UserPrintDetail -import icu.samnyan.aqua.sega.util.BasicMapper +import aquadx.sega.general.BaseHandler +import aquadx.sega.general.service.CardService +import aquadx.sega.maimai2.model.Mai2Repos +import aquadx.sega.maimai2.model.userdata.Mai2UserPrintDetail +import aquadx.sega.util.BasicMapper import org.springframework.beans.factory.annotation.Value import org.springframework.stereotype.Component import java.time.LocalDateTime diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/model/Repos.kt b/planet/src/main/kotlin/aquadx/sega/maimai2/model/Repos.kt similarity index 92% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/model/Repos.kt rename to planet/src/main/kotlin/aquadx/sega/maimai2/model/Repos.kt index 7f6fb1f3..bf84f3d3 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/model/Repos.kt +++ b/planet/src/main/kotlin/aquadx/sega/maimai2/model/Repos.kt @@ -1,13 +1,13 @@ @file:Suppress("FunctionName") -package icu.samnyan.aqua.sega.maimai2.model +package aquadx.sega.maimai2.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.general.model.Card -import icu.samnyan.aqua.sega.maimai2.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.general.model.Card +import aquadx.sega.maimai2.model.userdata.* import org.springframework.data.domain.Page import org.springframework.data.domain.Pageable import org.springframework.data.jpa.repository.JpaRepository @@ -15,8 +15,8 @@ import org.springframework.data.jpa.repository.Modifying import org.springframework.data.repository.NoRepositoryBean import org.springframework.stereotype.Component import org.springframework.transaction.annotation.Transactional -import icu.samnyan.aqua.sega.util.GameDataService -import icu.samnyan.aqua.sega.util.StaticRepo +import aquadx.sega.util.GameDataService +import aquadx.sega.util.StaticRepo import java.util.* @NoRepositoryBean diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/ongeki/OngekiApis.kt b/planet/src/main/kotlin/aquadx/sega/ongeki/OngekiApis.kt similarity index 98% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/ongeki/OngekiApis.kt rename to planet/src/main/kotlin/aquadx/sega/ongeki/OngekiApis.kt index 32e477a0..e3020d09 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/ongeki/OngekiApis.kt +++ b/planet/src/main/kotlin/aquadx/sega/ongeki/OngekiApis.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.ongeki +package aquadx.sega.ongeki import ext.empty import ext.int diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/ongeki/OngekiCMApis.kt b/planet/src/main/kotlin/aquadx/sega/ongeki/OngekiCMApis.kt similarity index 99% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/ongeki/OngekiCMApis.kt rename to planet/src/main/kotlin/aquadx/sega/ongeki/OngekiCMApis.kt index 0797ef8d..c80beba0 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/ongeki/OngekiCMApis.kt +++ b/planet/src/main/kotlin/aquadx/sega/ongeki/OngekiCMApis.kt @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.ongeki +package aquadx.sega.ongeki import ext.* -import icu.samnyan.aqua.sega.ongeki.model.* +import aquadx.sega.ongeki.model.* import java.time.LocalDateTime fun OngekiController.cmApiInit() { diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/ongeki/OngekiController.kt b/planet/src/main/kotlin/aquadx/sega/ongeki/OngekiController.kt similarity index 82% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/ongeki/OngekiController.kt rename to planet/src/main/kotlin/aquadx/sega/ongeki/OngekiController.kt index 5ad12b67..c0c2e1c0 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/ongeki/OngekiController.kt +++ b/planet/src/main/kotlin/aquadx/sega/ongeki/OngekiController.kt @@ -1,15 +1,15 @@ -package icu.samnyan.aqua.sega.ongeki +package aquadx.sega.ongeki +import aquadx.net.db.AquaUserServices +import aquadx.net.utils.simpleDescribe +import aquadx.sega.allnet.TokenChecker import ext.* -import icu.samnyan.aqua.net.db.AquaUserServices -import icu.samnyan.aqua.net.utils.simpleDescribe -import icu.samnyan.aqua.sega.allnet.TokenChecker -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.spring.Metrics +import aquadx.sega.general.GameMusicPopularity +import aquadx.sega.general.MeowApi +import aquadx.sega.general.RequestContext +import aquadx.sega.util.BasicMapper +import aquadx.spring.Metrics +import aquadx.sega.general.service.CardService import jakarta.servlet.http.HttpServletRequest import org.springframework.web.bind.annotation.RestController diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/ongeki/OngekiRepos.kt b/planet/src/main/kotlin/aquadx/sega/ongeki/OngekiRepos.kt similarity index 83% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/ongeki/OngekiRepos.kt rename to planet/src/main/kotlin/aquadx/sega/ongeki/OngekiRepos.kt index 97202479..5fbc0293 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/ongeki/OngekiRepos.kt +++ b/planet/src/main/kotlin/aquadx/sega/ongeki/OngekiRepos.kt @@ -1,19 +1,50 @@ @file:Suppress("FunctionName") -package icu.samnyan.aqua.sega.ongeki -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.ongeki.model.* +package aquadx.sega.ongeki + +import aquadx.net.games.GenericPlaylogRepo +import aquadx.net.games.GenericUserDataRepo +import aquadx.net.games.GenericUserMusicRepo +import aquadx.net.games.IUserRepo +import aquadx.sega.ongeki.model.GameGachaCard +import aquadx.sega.ongeki.model.UserActivity +import aquadx.sega.ongeki.model.UserBoss +import aquadx.sega.ongeki.model.UserCard +import aquadx.sega.ongeki.model.UserChapter +import aquadx.sega.ongeki.model.UserCharacter +import aquadx.sega.ongeki.model.UserData +import aquadx.sega.ongeki.model.UserDeck +import aquadx.sega.ongeki.model.UserEventMap +import aquadx.sega.ongeki.model.UserEventMusic +import aquadx.sega.ongeki.model.UserEventPoint +import aquadx.sega.ongeki.model.UserGacha +import aquadx.sega.ongeki.model.UserGeneralData +import aquadx.sega.ongeki.model.UserItem +import aquadx.sega.ongeki.model.UserKop +import aquadx.sega.ongeki.model.UserLoginBonus +import aquadx.sega.ongeki.model.UserMemoryChapter +import aquadx.sega.ongeki.model.UserMissionPoint +import aquadx.sega.ongeki.model.UserMusicDetail +import aquadx.sega.ongeki.model.UserMusicItem +import aquadx.sega.ongeki.model.UserOption +import aquadx.sega.ongeki.model.UserPlaylog +import aquadx.sega.ongeki.model.UserRegions +import aquadx.sega.ongeki.model.UserRival +import aquadx.sega.ongeki.model.UserScenario +import aquadx.sega.ongeki.model.UserSkin +import aquadx.sega.ongeki.model.UserStory +import aquadx.sega.ongeki.model.UserTechCount +import aquadx.sega.ongeki.model.UserTechEvent +import aquadx.sega.ongeki.model.UserTradeItem +import aquadx.sega.ongeki.model.UserTrainingRoom +import aquadx.sega.util.GameDataService +import aquadx.sega.util.StaticRepo +import aquadx.sega.ongeki.model.* 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 java.util.* diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/ongeki/OngekiUpsertAllApi.kt b/planet/src/main/kotlin/aquadx/sega/ongeki/OngekiUpsertAllApi.kt similarity index 96% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/ongeki/OngekiUpsertAllApi.kt rename to planet/src/main/kotlin/aquadx/sega/ongeki/OngekiUpsertAllApi.kt index 67f11000..9c9fa262 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/ongeki/OngekiUpsertAllApi.kt +++ b/planet/src/main/kotlin/aquadx/sega/ongeki/OngekiUpsertAllApi.kt @@ -1,14 +1,14 @@ -package icu.samnyan.aqua.sega.ongeki +package aquadx.sega.ongeki import ext.int import ext.invoke import ext.mapApply import ext.minus -import icu.samnyan.aqua.sega.general.model.CardStatus -import icu.samnyan.aqua.sega.ongeki.model.OngekiUpsertUserAll -import icu.samnyan.aqua.sega.ongeki.model.UserData -import icu.samnyan.aqua.sega.ongeki.model.UserGeneralData -import icu.samnyan.aqua.sega.ongeki.model.UserRegions +import aquadx.sega.general.model.CardStatus +import aquadx.sega.ongeki.model.OngekiUpsertUserAll +import aquadx.sega.ongeki.model.UserData +import aquadx.sega.ongeki.model.UserGeneralData +import aquadx.sega.ongeki.model.UserRegions fun OngekiController.initUpsertAll() { diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/ongeki/OngekiUserApis.kt b/planet/src/main/kotlin/aquadx/sega/ongeki/OngekiUserApis.kt similarity index 96% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/ongeki/OngekiUserApis.kt rename to planet/src/main/kotlin/aquadx/sega/ongeki/OngekiUserApis.kt index 59fb88b0..0676b708 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/ongeki/OngekiUserApis.kt +++ b/planet/src/main/kotlin/aquadx/sega/ongeki/OngekiUserApis.kt @@ -1,12 +1,12 @@ @file:Suppress("UNCHECKED_CAST") -package icu.samnyan.aqua.sega.ongeki +package aquadx.sega.ongeki import ext.* -import icu.samnyan.aqua.sega.general.model.CardStatus -import icu.samnyan.aqua.sega.general.model.UserRecentRating -import icu.samnyan.aqua.sega.ongeki.model.OgkItemType -import icu.samnyan.aqua.sega.ongeki.model.UserItem +import aquadx.sega.general.model.CardStatus +import aquadx.sega.general.model.UserRecentRating +import aquadx.sega.ongeki.model.OgkItemType +import aquadx.sega.ongeki.model.UserItem import org.springframework.data.domain.PageRequest import org.springframework.data.domain.Sort import java.time.LocalDateTime diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/util/BasicMapper.kt b/planet/src/main/kotlin/aquadx/sega/util/BasicMapper.kt similarity index 99% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/util/BasicMapper.kt rename to planet/src/main/kotlin/aquadx/sega/util/BasicMapper.kt index a5b9eb01..6dc06fe7 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/util/BasicMapper.kt +++ b/planet/src/main/kotlin/aquadx/sega/util/BasicMapper.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.util +package aquadx.sega.util import com.fasterxml.jackson.core.JsonGenerator import com.fasterxml.jackson.core.json.JsonWriteFeature diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/util/GameDataService.kt b/planet/src/main/kotlin/aquadx/sega/util/GameDataService.kt similarity index 71% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/util/GameDataService.kt rename to planet/src/main/kotlin/aquadx/sega/util/GameDataService.kt index b2322465..cc0337e3 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/util/GameDataService.kt +++ b/planet/src/main/kotlin/aquadx/sega/util/GameDataService.kt @@ -1,28 +1,28 @@ -package icu.samnyan.aqua.sega.util +package aquadx.sega.util import com.fasterxml.jackson.core.type.TypeReference import ext.logger import ext.toJson -import icu.samnyan.aqua.sega.chusan.model.GameCharge as Chu3GameCharge -import icu.samnyan.aqua.sega.chusan.model.GameEvent as Chu3GameEvent -import icu.samnyan.aqua.sega.chusan.model.GameGacha as Chu3GameGacha -import icu.samnyan.aqua.sega.chusan.model.GameGachaCard as Chu3GameGachaCard -import icu.samnyan.aqua.sega.chusan.model.GameLinkedVerse as Chu3GameLinkedVerse -import icu.samnyan.aqua.sega.chusan.model.GameLoginBonus as Chu3GameLoginBonus -import icu.samnyan.aqua.sega.chusan.model.GameLoginBonusPreset as Chu3GameLoginBonusPreset -import icu.samnyan.aqua.sega.maimai2.model.Mai2GameCharge -import icu.samnyan.aqua.sega.maimai2.model.Mai2GameEvent -import icu.samnyan.aqua.sega.maimai2.model.Mai2GameSellingCard -import icu.samnyan.aqua.sega.ongeki.model.GameCard as OgkGameCard -import icu.samnyan.aqua.sega.ongeki.model.GameChara as OgkGameChara -import icu.samnyan.aqua.sega.ongeki.model.GameEvent as OgkGameEvent -import icu.samnyan.aqua.sega.ongeki.model.GameGacha as OgkGameGacha -import icu.samnyan.aqua.sega.ongeki.model.GameGachaCard as OgkGameGachaCard -import icu.samnyan.aqua.sega.ongeki.model.GameMusic as OgkGameMusic -import icu.samnyan.aqua.sega.ongeki.model.GamePoint as OgkGamePoint -import icu.samnyan.aqua.sega.ongeki.model.GamePresent as OgkGamePresent -import icu.samnyan.aqua.sega.ongeki.model.GameReward as OgkGameReward -import icu.samnyan.aqua.sega.ongeki.model.GameSkill as OgkGameSkill +import aquadx.sega.chusan.model.GameCharge as Chu3GameCharge +import aquadx.sega.chusan.model.GameEvent as Chu3GameEvent +import aquadx.sega.chusan.model.GameGacha as Chu3GameGacha +import aquadx.sega.chusan.model.GameGachaCard as Chu3GameGachaCard +import aquadx.sega.chusan.model.GameLinkedVerse as Chu3GameLinkedVerse +import aquadx.sega.chusan.model.GameLoginBonus as Chu3GameLoginBonus +import aquadx.sega.chusan.model.GameLoginBonusPreset as Chu3GameLoginBonusPreset +import aquadx.sega.maimai2.model.Mai2GameCharge +import aquadx.sega.maimai2.model.Mai2GameEvent +import aquadx.sega.maimai2.model.Mai2GameSellingCard +import aquadx.sega.ongeki.model.GameCard as OgkGameCard +import aquadx.sega.ongeki.model.GameChara as OgkGameChara +import aquadx.sega.ongeki.model.GameEvent as OgkGameEvent +import aquadx.sega.ongeki.model.GameGacha as OgkGameGacha +import aquadx.sega.ongeki.model.GameGachaCard as OgkGameGachaCard +import aquadx.sega.ongeki.model.GameMusic as OgkGameMusic +import aquadx.sega.ongeki.model.GamePoint as OgkGamePoint +import aquadx.sega.ongeki.model.GamePresent as OgkGamePresent +import aquadx.sega.ongeki.model.GameReward as OgkGameReward +import aquadx.sega.ongeki.model.GameSkill as OgkGameSkill import org.slf4j.LoggerFactory import org.springframework.stereotype.Service import java.io.File diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/util/StaticRepo.kt b/planet/src/main/kotlin/aquadx/sega/util/StaticRepo.kt similarity index 96% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/util/StaticRepo.kt rename to planet/src/main/kotlin/aquadx/sega/util/StaticRepo.kt index 79a21176..8cf0a860 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/util/StaticRepo.kt +++ b/planet/src/main/kotlin/aquadx/sega/util/StaticRepo.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.util +package aquadx.sega.util import java.lang.reflect.Field import java.util.* diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/wacca/WaccaServer.kt b/planet/src/main/kotlin/aquadx/sega/wacca/WaccaServer.kt similarity index 96% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/wacca/WaccaServer.kt rename to planet/src/main/kotlin/aquadx/sega/wacca/WaccaServer.kt index 242a46e3..a28b42c9 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/wacca/WaccaServer.kt +++ b/planet/src/main/kotlin/aquadx/sega/wacca/WaccaServer.kt @@ -1,20 +1,20 @@ -package icu.samnyan.aqua.sega.wacca +package aquadx.sega.wacca import ext.* -import icu.samnyan.aqua.net.db.AquaGameOptions -import icu.samnyan.aqua.net.games.wacca.Wacca -import icu.samnyan.aqua.net.utils.ApiException -import icu.samnyan.aqua.net.utils.simpleDescribe -import icu.samnyan.aqua.sega.general.dao.CardRepository -import icu.samnyan.aqua.sega.general.model.CardStatus -import icu.samnyan.aqua.sega.wacca.WaccaItemType.* -import icu.samnyan.aqua.sega.wacca.WaccaItemType.NOTE_COLOR -import icu.samnyan.aqua.sega.wacca.WaccaItemType.NOTE_SOUND -import icu.samnyan.aqua.sega.wacca.WaccaItemType.TOUCH_EFFECT -import icu.samnyan.aqua.sega.wacca.WaccaOptionType.* -import icu.samnyan.aqua.sega.wacca.model.BaseRequest -import icu.samnyan.aqua.sega.wacca.model.db.* -import icu.samnyan.aqua.spring.Metrics +import aquadx.net.db.AquaGameOptions +import aquadx.net.games.wacca.Wacca +import aquadx.net.utils.ApiException +import aquadx.net.utils.simpleDescribe +import aquadx.sega.general.dao.CardRepository +import aquadx.sega.general.model.CardStatus +import aquadx.sega.wacca.WaccaItemType.* +import aquadx.sega.wacca.WaccaItemType.NOTE_COLOR +import aquadx.sega.wacca.WaccaItemType.NOTE_SOUND +import aquadx.sega.wacca.WaccaItemType.TOUCH_EFFECT +import aquadx.sega.wacca.WaccaOptionType.* +import aquadx.sega.wacca.model.BaseRequest +import aquadx.sega.wacca.model.db.* +import aquadx.spring.Metrics import io.ktor.client.utils.* import jakarta.servlet.http.HttpServletRequest import org.springframework.beans.factory.annotation.Autowired diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/sega/wacca/model/db/Repos.kt b/planet/src/main/kotlin/aquadx/sega/wacca/model/db/Repos.kt similarity index 91% rename from planet/src/main/kotlin/icu/samnyan/aqua/sega/wacca/model/db/Repos.kt rename to planet/src/main/kotlin/aquadx/sega/wacca/model/db/Repos.kt index ca599394..a4559f98 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/sega/wacca/model/db/Repos.kt +++ b/planet/src/main/kotlin/aquadx/sega/wacca/model/db/Repos.kt @@ -1,8 +1,8 @@ -package icu.samnyan.aqua.sega.wacca.model.db +package aquadx.sega.wacca.model.db -import icu.samnyan.aqua.net.games.GenericPlaylogRepo -import icu.samnyan.aqua.net.games.GenericUserDataRepo -import icu.samnyan.aqua.net.games.GenericUserMusicRepo +import aquadx.net.games.GenericPlaylogRepo +import aquadx.net.games.GenericUserDataRepo +import aquadx.net.games.GenericUserMusicRepo import jakarta.transaction.Transactional import org.springframework.data.jpa.repository.JpaRepository import org.springframework.data.jpa.repository.Query diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/spring/AquaLogging.kt b/planet/src/main/kotlin/aquadx/spring/AquaLogging.kt similarity index 89% rename from planet/src/main/kotlin/icu/samnyan/aqua/spring/AquaLogging.kt rename to planet/src/main/kotlin/aquadx/spring/AquaLogging.kt index b540c79d..79254d70 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/spring/AquaLogging.kt +++ b/planet/src/main/kotlin/aquadx/spring/AquaLogging.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.spring +package aquadx.spring import ch.qos.logback.classic.spi.ILoggingEvent import ch.qos.logback.core.pattern.CompositeConverter @@ -6,8 +6,8 @@ import ext.get import org.springframework.boot.ansi.AnsiColor import org.springframework.boot.ansi.AnsiOutput -private const val PROJECT_PACKAGE_PREFIX = "icu.samnyan.aqua" -private const val SEGA_PACKAGE_PREFIX = "icu.samnyan.aqua.sega" +private const val PROJECT_PACKAGE_PREFIX = "aquadx" +private const val SEGA_PACKAGE_PREFIX = "aquadx.sega" private val SYSTEM_COLOR = AnsiColor.WHITE private val SEGA_COLOR = AnsiColor.BRIGHT_CYAN private val MISC_COLOR = AnsiColor.BRIGHT_BLUE diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/spring/AutoChecker.kt b/planet/src/main/kotlin/aquadx/spring/AutoChecker.kt similarity index 97% rename from planet/src/main/kotlin/icu/samnyan/aqua/spring/AutoChecker.kt rename to planet/src/main/kotlin/aquadx/spring/AutoChecker.kt index 45a0757d..ff4f9e55 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/spring/AutoChecker.kt +++ b/planet/src/main/kotlin/aquadx/spring/AutoChecker.kt @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.spring +package aquadx.spring -import icu.samnyan.aqua.sega.aimedb.AimeDbProps -import icu.samnyan.aqua.sega.allnet.AllNetProps +import aquadx.sega.aimedb.AimeDbProps +import aquadx.sega.allnet.AllNetProps import org.apache.hc.client5.http.impl.classic.HttpClients import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder import org.apache.hc.client5.http.ssl.NoopHostnameVerifier diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/spring/DataSourceConfig.kt b/planet/src/main/kotlin/aquadx/spring/DataSourceConfig.kt similarity index 95% rename from planet/src/main/kotlin/icu/samnyan/aqua/spring/DataSourceConfig.kt rename to planet/src/main/kotlin/aquadx/spring/DataSourceConfig.kt index 06847d6e..1841c504 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/spring/DataSourceConfig.kt +++ b/planet/src/main/kotlin/aquadx/spring/DataSourceConfig.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.spring +package aquadx.spring import org.springframework.beans.factory.annotation.Value import org.springframework.context.annotation.Configuration diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/spring/GenDocs.kt b/planet/src/main/kotlin/aquadx/spring/GenDocs.kt similarity index 93% rename from planet/src/main/kotlin/icu/samnyan/aqua/spring/GenDocs.kt rename to planet/src/main/kotlin/aquadx/spring/GenDocs.kt index c9b952ae..382f8e21 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/spring/GenDocs.kt +++ b/planet/src/main/kotlin/aquadx/spring/GenDocs.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.spring +package aquadx.spring import ext.API import ext.Doc @@ -9,7 +9,7 @@ import kotlin.reflect.full.findAnnotation import kotlin.reflect.full.hasAnnotation import kotlin.reflect.javaType -const val PACKAGE_NAME = "icu.samnyan.aqua.net" +const val PACKAGE_NAME = "aquadx.net" @OptIn(ExperimentalStdlibApi::class) fun main() { diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/spring/Metrics.kt b/planet/src/main/kotlin/aquadx/spring/Metrics.kt similarity index 97% rename from planet/src/main/kotlin/icu/samnyan/aqua/spring/Metrics.kt rename to planet/src/main/kotlin/aquadx/spring/Metrics.kt index d37d62b4..8550b74f 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/spring/Metrics.kt +++ b/planet/src/main/kotlin/aquadx/spring/Metrics.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.spring +package aquadx.spring import io.micrometer.core.instrument.Counter import io.micrometer.core.instrument.Timer diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/spring/QuerydslConfig.kt b/planet/src/main/kotlin/aquadx/spring/QuerydslConfig.kt similarity index 89% rename from planet/src/main/kotlin/icu/samnyan/aqua/spring/QuerydslConfig.kt rename to planet/src/main/kotlin/aquadx/spring/QuerydslConfig.kt index 1e0e35c0..bedd2058 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/spring/QuerydslConfig.kt +++ b/planet/src/main/kotlin/aquadx/spring/QuerydslConfig.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.spring +package aquadx.spring import com.querydsl.jpa.impl.JPAQueryFactory import jakarta.persistence.EntityManager diff --git a/planet/src/main/kotlin/icu/samnyan/aqua/spring/SecurityConfig.kt b/planet/src/main/kotlin/aquadx/spring/SecurityConfig.kt similarity index 97% rename from planet/src/main/kotlin/icu/samnyan/aqua/spring/SecurityConfig.kt rename to planet/src/main/kotlin/aquadx/spring/SecurityConfig.kt index 4c756559..3ffc7b69 100644 --- a/planet/src/main/kotlin/icu/samnyan/aqua/spring/SecurityConfig.kt +++ b/planet/src/main/kotlin/aquadx/spring/SecurityConfig.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.spring +package aquadx.spring import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration diff --git a/planet/src/main/kotlin/ext/Spring.kt b/planet/src/main/kotlin/ext/Spring.kt index cd53d667..598542da 100644 --- a/planet/src/main/kotlin/ext/Spring.kt +++ b/planet/src/main/kotlin/ext/Spring.kt @@ -1,6 +1,6 @@ package ext -import icu.samnyan.aqua.net.utils.ApiException +import aquadx.net.utils.ApiException import jakarta.persistence.Query import jakarta.servlet.http.HttpServletRequest import jakarta.servlet.http.HttpServletResponse diff --git a/planet/src/test/kotlin/test/Mai2Test.kt b/planet/src/test/kotlin/test/Mai2Test.kt index 2bb75c61..59bb654b 100644 --- a/planet/src/test/kotlin/test/Mai2Test.kt +++ b/planet/src/test/kotlin/test/Mai2Test.kt @@ -1,7 +1,7 @@ package test import ext.* -import icu.samnyan.aqua.sega.util.ZLib +import aquadx.sega.util.ZLib import io.kotest.core.spec.style.StringSpec import io.kotest.matchers.shouldBe import io.ktor.client.call.* diff --git a/planet/src/test/kotlin/test/WaccaTest.kt b/planet/src/test/kotlin/test/WaccaTest.kt index 6ee381ed..21c7eb58 100644 --- a/planet/src/test/kotlin/test/WaccaTest.kt +++ b/planet/src/test/kotlin/test/WaccaTest.kt @@ -1,8 +1,8 @@ package test import ext.* -import icu.samnyan.aqua.sega.wacca.WaccaServer -import icu.samnyan.aqua.sega.wacca.init +import aquadx.sega.wacca.WaccaServer +import aquadx.sega.wacca.init import io.kotest.core.spec.style.StringSpec import io.kotest.matchers.shouldBe import io.ktor.client.request.* diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/net/Safety.kt b/shared/src/main/kotlin/aquadx/net/Safety.kt similarity index 92% rename from shared/src/main/kotlin/icu/samnyan/aqua/net/Safety.kt rename to shared/src/main/kotlin/aquadx/net/Safety.kt index baf19f6a..cea58641 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/net/Safety.kt +++ b/shared/src/main/kotlin/aquadx/net/Safety.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.net +package aquadx.net import jakarta.persistence.* import java.io.Serializable diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/net/db/AquaEmailConfirmation.kt b/shared/src/main/kotlin/aquadx/net/db/AquaEmailConfirmation.kt similarity index 94% rename from shared/src/main/kotlin/icu/samnyan/aqua/net/db/AquaEmailConfirmation.kt rename to shared/src/main/kotlin/aquadx/net/db/AquaEmailConfirmation.kt index aac7242f..fdc283fd 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/net/db/AquaEmailConfirmation.kt +++ b/shared/src/main/kotlin/aquadx/net/db/AquaEmailConfirmation.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.net.db +package aquadx.net.db import jakarta.persistence.* import java.io.Serializable diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/net/db/AquaEmailResetPassword.kt b/shared/src/main/kotlin/aquadx/net/db/AquaEmailResetPassword.kt similarity index 94% rename from shared/src/main/kotlin/icu/samnyan/aqua/net/db/AquaEmailResetPassword.kt rename to shared/src/main/kotlin/aquadx/net/db/AquaEmailResetPassword.kt index 24797993..f4ac2523 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/net/db/AquaEmailResetPassword.kt +++ b/shared/src/main/kotlin/aquadx/net/db/AquaEmailResetPassword.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.net.db +package aquadx.net.db import jakarta.persistence.* import java.io.Serializable diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/net/db/AquaGameOptions.kt b/shared/src/main/kotlin/aquadx/net/db/AquaGameOptions.kt similarity index 98% rename from shared/src/main/kotlin/icu/samnyan/aqua/net/db/AquaGameOptions.kt rename to shared/src/main/kotlin/aquadx/net/db/AquaGameOptions.kt index 78288d69..bf4e6296 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/net/db/AquaGameOptions.kt +++ b/shared/src/main/kotlin/aquadx/net/db/AquaGameOptions.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.net.db +package aquadx.net.db import com.fasterxml.jackson.annotation.JsonIgnore import ext.SettingField diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/net/db/AquaNetSession.kt b/shared/src/main/kotlin/aquadx/net/db/AquaNetSession.kt similarity index 94% rename from shared/src/main/kotlin/icu/samnyan/aqua/net/db/AquaNetSession.kt rename to shared/src/main/kotlin/aquadx/net/db/AquaNetSession.kt index d8452b59..9930f911 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/net/db/AquaNetSession.kt +++ b/shared/src/main/kotlin/aquadx/net/db/AquaNetSession.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.net.db +package aquadx.net.db import jakarta.persistence.* import java.io.Serializable diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/net/db/AquaNetUser.kt b/shared/src/main/kotlin/aquadx/net/db/AquaNetUser.kt similarity index 95% rename from shared/src/main/kotlin/icu/samnyan/aqua/net/db/AquaNetUser.kt rename to shared/src/main/kotlin/aquadx/net/db/AquaNetUser.kt index ed6d773e..bd8a0b81 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/net/db/AquaNetUser.kt +++ b/shared/src/main/kotlin/aquadx/net/db/AquaNetUser.kt @@ -1,9 +1,9 @@ -package icu.samnyan.aqua.net.db +package aquadx.net.db import com.fasterxml.jackson.annotation.JsonIgnore import ext.* -import icu.samnyan.aqua.sega.allnet.KeychipSession -import icu.samnyan.aqua.sega.general.model.Card +import aquadx.sega.allnet.KeychipSession +import aquadx.sega.general.model.Card import jakarta.persistence.* import java.io.Serializable import kotlin.reflect.KFunction diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/net/games/Models.kt b/shared/src/main/kotlin/aquadx/net/games/Models.kt similarity index 97% rename from shared/src/main/kotlin/icu/samnyan/aqua/net/games/Models.kt rename to shared/src/main/kotlin/aquadx/net/games/Models.kt index 9222b36a..5212f6d2 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/net/games/Models.kt +++ b/shared/src/main/kotlin/aquadx/net/games/Models.kt @@ -1,9 +1,9 @@ -package icu.samnyan.aqua.net.games +package aquadx.net.games import com.fasterxml.jackson.annotation.JsonIgnore import ext.JACKSON import ext.JavaSerializable -import icu.samnyan.aqua.sega.general.model.Card +import aquadx.sega.general.model.Card import jakarta.persistence.GeneratedValue import jakarta.persistence.GenerationType import jakarta.persistence.Id diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/net/utils/ApiException.kt b/shared/src/main/kotlin/aquadx/net/utils/ApiException.kt similarity index 86% rename from shared/src/main/kotlin/icu/samnyan/aqua/net/utils/ApiException.kt rename to shared/src/main/kotlin/aquadx/net/utils/ApiException.kt index 891ea584..111d7b5f 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/net/utils/ApiException.kt +++ b/shared/src/main/kotlin/aquadx/net/utils/ApiException.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.net.utils +package aquadx.net.utils import ext.Str import org.slf4j.LoggerFactory diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/allnet/Keychip.kt b/shared/src/main/kotlin/aquadx/sega/allnet/Keychip.kt similarity index 82% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/allnet/Keychip.kt rename to shared/src/main/kotlin/aquadx/sega/allnet/Keychip.kt index a3ae6fd8..626f2503 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/allnet/Keychip.kt +++ b/shared/src/main/kotlin/aquadx/sega/allnet/Keychip.kt @@ -1,6 +1,6 @@ -package icu.samnyan.aqua.sega.allnet +package aquadx.sega.allnet -import icu.samnyan.aqua.net.db.AquaNetUser +import aquadx.net.db.AquaNetUser import jakarta.persistence.* import java.io.Serializable diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/allnet/KeychipSession.kt b/shared/src/main/kotlin/aquadx/sega/allnet/KeychipSession.kt similarity index 90% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/allnet/KeychipSession.kt rename to shared/src/main/kotlin/aquadx/sega/allnet/KeychipSession.kt index 6f45532f..fbfad19f 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/allnet/KeychipSession.kt +++ b/shared/src/main/kotlin/aquadx/sega/allnet/KeychipSession.kt @@ -1,6 +1,6 @@ -package icu.samnyan.aqua.sega.allnet +package aquadx.sega.allnet -import icu.samnyan.aqua.net.db.AquaNetUser +import aquadx.net.db.AquaNetUser import jakarta.persistence.* import java.security.SecureRandom diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/Chu3GameData.kt b/shared/src/main/kotlin/aquadx/sega/chusan/model/Chu3GameData.kt similarity index 98% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/Chu3GameData.kt rename to shared/src/main/kotlin/aquadx/sega/chusan/model/Chu3GameData.kt index 54ab772c..509ebc2c 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/Chu3GameData.kt +++ b/shared/src/main/kotlin/aquadx/sega/chusan/model/Chu3GameData.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.chusan.model +package aquadx.sega.chusan.model import com.fasterxml.jackson.annotation.JsonIgnore import com.fasterxml.jackson.annotation.JsonProperty diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/request/Chu3UserAll.kt b/shared/src/main/kotlin/aquadx/sega/chusan/model/request/Chu3UserAll.kt similarity index 93% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/request/Chu3UserAll.kt rename to shared/src/main/kotlin/aquadx/sega/chusan/model/request/Chu3UserAll.kt index 7046c9d3..01e432b6 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/request/Chu3UserAll.kt +++ b/shared/src/main/kotlin/aquadx/sega/chusan/model/request/Chu3UserAll.kt @@ -1,8 +1,8 @@ -package icu.samnyan.aqua.sega.chusan.model.request +package aquadx.sega.chusan.model.request import ext.JDict -import icu.samnyan.aqua.sega.chusan.model.userdata.* -import icu.samnyan.aqua.sega.general.model.UserRecentRating +import aquadx.sega.chusan.model.userdata.* +import aquadx.sega.general.model.UserRecentRating class UserCMissionResp { var missionId = 0 diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/request/MatchingWaitState.kt b/shared/src/main/kotlin/aquadx/sega/chusan/model/request/MatchingWaitState.kt similarity index 69% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/request/MatchingWaitState.kt rename to shared/src/main/kotlin/aquadx/sega/chusan/model/request/MatchingWaitState.kt index 8614c37f..2d8d322f 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/request/MatchingWaitState.kt +++ b/shared/src/main/kotlin/aquadx/sega/chusan/model/request/MatchingWaitState.kt @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.chusan.model.request +package aquadx.sega.chusan.model.request import com.fasterxml.jackson.annotation.JsonProperty -import icu.samnyan.aqua.sega.chusan.model.userdata.Chu3MatchingMemberReq +import aquadx.sega.chusan.model.userdata.Chu3MatchingMemberReq class MatchingWaitState( var matchingMemberInfoList: List = listOf(), diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/request/UpsertUserGacha.kt b/shared/src/main/kotlin/aquadx/sega/chusan/model/request/UpsertUserGacha.kt similarity index 64% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/request/UpsertUserGacha.kt rename to shared/src/main/kotlin/aquadx/sega/chusan/model/request/UpsertUserGacha.kt index afd1ffa4..cc5f8939 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/request/UpsertUserGacha.kt +++ b/shared/src/main/kotlin/aquadx/sega/chusan/model/request/UpsertUserGacha.kt @@ -1,10 +1,10 @@ -package icu.samnyan.aqua.sega.chusan.model.request +package aquadx.sega.chusan.model.request import com.fasterxml.jackson.annotation.JsonProperty -import icu.samnyan.aqua.sega.chusan.model.GameGachaCard -import icu.samnyan.aqua.sega.chusan.model.userdata.Chu3UserData -import icu.samnyan.aqua.sega.chusan.model.userdata.Chu3UserItem -import icu.samnyan.aqua.sega.chusan.model.userdata.UserGacha +import aquadx.sega.chusan.model.GameGachaCard +import aquadx.sega.chusan.model.userdata.Chu3UserData +import aquadx.sega.chusan.model.userdata.Chu3UserItem +import aquadx.sega.chusan.model.userdata.UserGacha import java.io.Serializable class UpsertUserGacha : Serializable { diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/request/UserEmoney.kt b/shared/src/main/kotlin/aquadx/sega/chusan/model/request/UserEmoney.kt similarity index 77% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/request/UserEmoney.kt rename to shared/src/main/kotlin/aquadx/sega/chusan/model/request/UserEmoney.kt index c3b47267..184f4f56 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/request/UserEmoney.kt +++ b/shared/src/main/kotlin/aquadx/sega/chusan/model/request/UserEmoney.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.chusan.model.request +package aquadx.sega.chusan.model.request class UserEmoney( var type: Int = 0, diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3MatchingMember.kt b/shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/Chu3MatchingMember.kt similarity index 95% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3MatchingMember.kt rename to shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/Chu3MatchingMember.kt index fd3a40c5..23dd7e56 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3MatchingMember.kt +++ b/shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/Chu3MatchingMember.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.chusan.model.userdata +package aquadx.sega.chusan.model.userdata import com.fasterxml.jackson.annotation.JsonProperty diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3NetBattleLog.kt b/shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/Chu3NetBattleLog.kt similarity index 97% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3NetBattleLog.kt rename to shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/Chu3NetBattleLog.kt index 3d6e15e6..2e478ef3 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3NetBattleLog.kt +++ b/shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/Chu3NetBattleLog.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.chusan.model.userdata +package aquadx.sega.chusan.model.userdata import jakarta.persistence.Entity import jakarta.persistence.Table diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3UserActivity.kt b/shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/Chu3UserActivity.kt similarity index 92% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3UserActivity.kt rename to shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/Chu3UserActivity.kt index 301f3fb1..a166e603 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3UserActivity.kt +++ b/shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/Chu3UserActivity.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.chusan.model.userdata +package aquadx.sega.chusan.model.userdata import com.fasterxml.jackson.annotation.JsonProperty import jakarta.persistence.Column diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3UserChallenge.kt b/shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/Chu3UserChallenge.kt similarity index 90% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3UserChallenge.kt rename to shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/Chu3UserChallenge.kt index 7f0e6ef2..a1f74fe1 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3UserChallenge.kt +++ b/shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/Chu3UserChallenge.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.chusan.model.userdata +package aquadx.sega.chusan.model.userdata import jakarta.persistence.Entity import jakarta.persistence.Table diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3UserData.kt b/shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/Chu3UserData.kt similarity index 94% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3UserData.kt rename to shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/Chu3UserData.kt index dc5fe40b..60c8d46d 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3UserData.kt +++ b/shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/Chu3UserData.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.chusan.model.userdata +package aquadx.sega.chusan.model.userdata import com.fasterxml.jackson.annotation.JsonIgnore import com.fasterxml.jackson.annotation.JsonInclude @@ -8,11 +8,11 @@ import com.fasterxml.jackson.databind.DeserializationContext import com.fasterxml.jackson.databind.JsonDeserializer import com.fasterxml.jackson.databind.annotation.JsonDeserialize import com.fasterxml.jackson.databind.annotation.JsonSerialize -import icu.samnyan.aqua.net.games.BaseEntity -import icu.samnyan.aqua.net.games.IUserData -import icu.samnyan.aqua.sega.chusan.model.request.UserEmoney -import icu.samnyan.aqua.sega.general.model.Card -import icu.samnyan.aqua.sega.util.AccessCodeSerializer +import aquadx.net.games.BaseEntity +import aquadx.net.games.IUserData +import aquadx.sega.chusan.model.request.UserEmoney +import aquadx.sega.general.model.Card +import aquadx.sega.util.AccessCodeSerializer import jakarta.persistence.* import java.io.IOException import java.time.LocalDateTime diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3UserEntity.kt b/shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/Chu3UserEntity.kt similarity index 72% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3UserEntity.kt rename to shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/Chu3UserEntity.kt index 27c3f49c..a9448e00 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3UserEntity.kt +++ b/shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/Chu3UserEntity.kt @@ -1,8 +1,8 @@ -package icu.samnyan.aqua.sega.chusan.model.userdata +package aquadx.sega.chusan.model.userdata import com.fasterxml.jackson.annotation.JsonIgnore -import icu.samnyan.aqua.net.games.BaseEntity -import icu.samnyan.aqua.net.games.IUserEntity +import aquadx.net.games.BaseEntity +import aquadx.net.games.IUserEntity import jakarta.persistence.JoinColumn import jakarta.persistence.ManyToOne import jakarta.persistence.MappedSuperclass diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3UserItem.kt b/shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/Chu3UserItem.kt similarity index 90% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3UserItem.kt rename to shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/Chu3UserItem.kt index 8419c0a9..18692c86 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3UserItem.kt +++ b/shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/Chu3UserItem.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.chusan.model.userdata +package aquadx.sega.chusan.model.userdata import com.fasterxml.jackson.annotation.JsonProperty import jakarta.persistence.Entity diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3UserLinkedVerse.kt b/shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/Chu3UserLinkedVerse.kt similarity index 94% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3UserLinkedVerse.kt rename to shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/Chu3UserLinkedVerse.kt index fb91c3ac..da55179f 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3UserLinkedVerse.kt +++ b/shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/Chu3UserLinkedVerse.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.chusan.model.userdata +package aquadx.sega.chusan.model.userdata import jakarta.persistence.Entity import jakarta.persistence.Table diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3UserMisc.kt b/shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/Chu3UserMisc.kt similarity index 81% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3UserMisc.kt rename to shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/Chu3UserMisc.kt index c767cb1f..5cb1d5fe 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3UserMisc.kt +++ b/shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/Chu3UserMisc.kt @@ -1,6 +1,6 @@ -package icu.samnyan.aqua.sega.chusan.model.userdata +package aquadx.sega.chusan.model.userdata -import icu.samnyan.aqua.sega.general.IntegerListConverter +import aquadx.sega.general.IntegerListConverter import jakarta.persistence.Convert import jakarta.persistence.Entity diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/UserCMission.kt b/shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/UserCMission.kt similarity index 81% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/UserCMission.kt rename to shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/UserCMission.kt index e8c8c70b..7ff05f7c 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/UserCMission.kt +++ b/shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/UserCMission.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.chusan.model.userdata +package aquadx.sega.chusan.model.userdata import jakarta.persistence.Entity import jakarta.persistence.Table diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/UserCMissionProgress.kt b/shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/UserCMissionProgress.kt similarity index 91% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/UserCMissionProgress.kt rename to shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/UserCMissionProgress.kt index 93eeee22..cee9d422 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/UserCMissionProgress.kt +++ b/shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/UserCMissionProgress.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.chusan.model.userdata +package aquadx.sega.chusan.model.userdata import com.fasterxml.jackson.annotation.JsonIgnore import jakarta.persistence.Column diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/UserCardPrintState.kt b/shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/UserCardPrintState.kt similarity index 90% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/UserCardPrintState.kt rename to shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/UserCardPrintState.kt index 72f030f9..0d733a15 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/UserCardPrintState.kt +++ b/shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/UserCardPrintState.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.chusan.model.userdata +package aquadx.sega.chusan.model.userdata import com.fasterxml.jackson.annotation.JsonIgnore import jakarta.persistence.Entity diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/UserCharacter.kt b/shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/UserCharacter.kt similarity index 93% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/UserCharacter.kt rename to shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/UserCharacter.kt index ce55c47a..d123c7f3 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/UserCharacter.kt +++ b/shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/UserCharacter.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.chusan.model.userdata +package aquadx.sega.chusan.model.userdata import com.fasterxml.jackson.annotation.JsonProperty import jakarta.persistence.Column diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/UserCharge.kt b/shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/UserCharge.kt similarity index 91% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/UserCharge.kt rename to shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/UserCharge.kt index a6a206ed..d204e783 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/UserCharge.kt +++ b/shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/UserCharge.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.chusan.model.userdata +package aquadx.sega.chusan.model.userdata import jakarta.persistence.Entity import jakarta.persistence.Table diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/UserCourse.kt b/shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/UserCourse.kt similarity index 94% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/UserCourse.kt rename to shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/UserCourse.kt index 1d92cecb..fd46a5e1 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/UserCourse.kt +++ b/shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/UserCourse.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.chusan.model.userdata +package aquadx.sega.chusan.model.userdata import com.fasterxml.jackson.annotation.JsonProperty import jakarta.persistence.Entity import jakarta.persistence.Table diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/UserDuel.kt b/shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/UserDuel.kt similarity index 92% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/UserDuel.kt rename to shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/UserDuel.kt index bb270f94..e6f35105 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/UserDuel.kt +++ b/shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/UserDuel.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.chusan.model.userdata +package aquadx.sega.chusan.model.userdata import com.fasterxml.jackson.annotation.JsonProperty import jakarta.persistence.Column import jakarta.persistence.Entity diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/UserGacha.kt b/shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/UserGacha.kt similarity index 88% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/UserGacha.kt rename to shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/UserGacha.kt index f75856a3..4e276c0c 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/UserGacha.kt +++ b/shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/UserGacha.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.chusan.model.userdata +package aquadx.sega.chusan.model.userdata import jakarta.persistence.Entity import jakarta.persistence.Table diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/UserGameOption.kt b/shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/UserGameOption.kt similarity index 96% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/UserGameOption.kt rename to shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/UserGameOption.kt index 53bbd421..bf457262 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/UserGameOption.kt +++ b/shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/UserGameOption.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.chusan.model.userdata +package aquadx.sega.chusan.model.userdata import jakarta.persistence.Entity import jakarta.persistence.Table diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/UserGeneralData.kt b/shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/UserGeneralData.kt similarity index 86% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/UserGeneralData.kt rename to shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/UserGeneralData.kt index be7cbf0e..82b5e477 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/UserGeneralData.kt +++ b/shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/UserGeneralData.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.chusan.model.userdata +package aquadx.sega.chusan.model.userdata import jakarta.persistence.Column import jakarta.persistence.Entity diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/UserLoginBonus.kt b/shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/UserLoginBonus.kt similarity index 85% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/UserLoginBonus.kt rename to shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/UserLoginBonus.kt index 996da40f..56d6f119 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/UserLoginBonus.kt +++ b/shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/UserLoginBonus.kt @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.chusan.model.userdata +package aquadx.sega.chusan.model.userdata import ext.DATE_2018 -import icu.samnyan.aqua.net.games.BaseEntity +import aquadx.net.games.BaseEntity import jakarta.persistence.Entity import jakarta.persistence.Table import java.time.LocalDateTime diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/UserMap.kt b/shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/UserMap.kt similarity index 91% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/UserMap.kt rename to shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/UserMap.kt index 271b060b..ccd652c7 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/UserMap.kt +++ b/shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/UserMap.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.chusan.model.userdata +package aquadx.sega.chusan.model.userdata import com.fasterxml.jackson.annotation.JsonProperty import jakarta.persistence.Entity diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/UserMusicDetail.kt b/shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/UserMusicDetail.kt similarity index 86% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/UserMusicDetail.kt rename to shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/UserMusicDetail.kt index edc5e5de..90bbe7ef 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/UserMusicDetail.kt +++ b/shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/UserMusicDetail.kt @@ -1,9 +1,9 @@ -package icu.samnyan.aqua.sega.chusan.model.userdata +package aquadx.sega.chusan.model.userdata import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import icu.samnyan.aqua.net.games.IGenericUserMusic -import icu.samnyan.aqua.sega.util.BooleanToIntegerDeserializer +import aquadx.net.games.IGenericUserMusic +import aquadx.sega.util.BooleanToIntegerDeserializer import jakarta.persistence.Entity import jakarta.persistence.Table import jakarta.persistence.UniqueConstraint diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/UserPlaylog.kt b/shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/UserPlaylog.kt similarity index 95% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/UserPlaylog.kt rename to shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/UserPlaylog.kt index 00bf15df..f57c4355 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/UserPlaylog.kt +++ b/shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/UserPlaylog.kt @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.chusan.model.userdata +package aquadx.sega.chusan.model.userdata import com.fasterxml.jackson.annotation.JsonProperty -import icu.samnyan.aqua.net.games.IGenericGamePlaylog +import aquadx.net.games.IGenericGamePlaylog import jakarta.persistence.Column import jakarta.persistence.Entity import jakarta.persistence.Table diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/UserRegions.kt b/shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/UserRegions.kt similarity index 89% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/UserRegions.kt rename to shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/UserRegions.kt index 43c18e82..feb93be0 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/chusan/model/userdata/UserRegions.kt +++ b/shared/src/main/kotlin/aquadx/sega/chusan/model/userdata/UserRegions.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.chusan.model.userdata +package aquadx.sega.chusan.model.userdata import jakarta.persistence.Entity import jakarta.persistence.Table diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/DivaRequestModels.kt b/shared/src/main/kotlin/aquadx/sega/diva/model/DivaRequestModels.kt similarity index 98% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/DivaRequestModels.kt rename to shared/src/main/kotlin/aquadx/sega/diva/model/DivaRequestModels.kt index 98292f25..7a99c624 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/DivaRequestModels.kt +++ b/shared/src/main/kotlin/aquadx/sega/diva/model/DivaRequestModels.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.diva.model +package aquadx.sega.diva.model import java.time.ZonedDateTime diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/DivaResponse.kt b/shared/src/main/kotlin/aquadx/sega/diva/model/DivaResponse.kt similarity index 99% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/DivaResponse.kt rename to shared/src/main/kotlin/aquadx/sega/diva/model/DivaResponse.kt index cc341d52..08f9f090 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/DivaResponse.kt +++ b/shared/src/main/kotlin/aquadx/sega/diva/model/DivaResponse.kt @@ -1,9 +1,9 @@ @file:Suppress("unused") -package icu.samnyan.aqua.sega.diva.model +package aquadx.sega.diva.model -import icu.samnyan.aqua.sega.diva.model.common.* -import icu.samnyan.aqua.sega.diva.util.URIEncoder +import aquadx.sega.diva.model.common.* +import aquadx.sega.diva.util.URIEncoder import java.time.LocalDateTime class CardProcedureResponse { diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/Internalizable.kt b/shared/src/main/kotlin/aquadx/sega/diva/model/Internalizable.kt similarity index 74% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/Internalizable.kt rename to shared/src/main/kotlin/aquadx/sega/diva/model/Internalizable.kt index 6bc103ca..82b04da5 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/Internalizable.kt +++ b/shared/src/main/kotlin/aquadx/sega/diva/model/Internalizable.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.diva.model +package aquadx.sega.diva.model /** * @author samnyan (privateamusement@protonmail.com) diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/common/Const.kt b/shared/src/main/kotlin/aquadx/sega/diva/model/common/Const.kt similarity index 93% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/common/Const.kt rename to shared/src/main/kotlin/aquadx/sega/diva/model/common/Const.kt index 4f74e70b..6692baa1 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/common/Const.kt +++ b/shared/src/main/kotlin/aquadx/sega/diva/model/common/Const.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.diva.model.common +package aquadx.sega.diva.model.common object Const { const val ALL_NOT_HAVE: String = diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/common/ContestProgress.kt b/shared/src/main/kotlin/aquadx/sega/diva/model/common/ContestProgress.kt similarity index 78% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/common/ContestProgress.kt rename to shared/src/main/kotlin/aquadx/sega/diva/model/common/ContestProgress.kt index ac82a27c..fe37b45c 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/common/ContestProgress.kt +++ b/shared/src/main/kotlin/aquadx/sega/diva/model/common/ContestProgress.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.diva.model.common +package aquadx.sega.diva.model.common class ContestProgress( var pvId: Int = 0, diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/common/LevelInfo.kt b/shared/src/main/kotlin/aquadx/sega/diva/model/common/LevelInfo.kt similarity index 61% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/common/LevelInfo.kt rename to shared/src/main/kotlin/aquadx/sega/diva/model/common/LevelInfo.kt index 5d1be423..aafbc6be 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/common/LevelInfo.kt +++ b/shared/src/main/kotlin/aquadx/sega/diva/model/common/LevelInfo.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.diva.model.common +package aquadx.sega.diva.model.common class LevelInfo( var levelNumber: Int = 0, diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/common/SortMode.kt b/shared/src/main/kotlin/aquadx/sega/diva/model/common/SortMode.kt similarity index 98% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/common/SortMode.kt rename to shared/src/main/kotlin/aquadx/sega/diva/model/common/SortMode.kt index e2330e11..4425e3ee 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/common/SortMode.kt +++ b/shared/src/main/kotlin/aquadx/sega/diva/model/common/SortMode.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.diva.model.common +package aquadx.sega.diva.model.common import com.fasterxml.jackson.annotation.JsonValue diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/common/collection/ClearTally.kt b/shared/src/main/kotlin/aquadx/sega/diva/model/common/collection/ClearTally.kt similarity index 90% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/common/collection/ClearTally.kt rename to shared/src/main/kotlin/aquadx/sega/diva/model/common/collection/ClearTally.kt index ce6d3c73..4ae10bdc 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/common/collection/ClearTally.kt +++ b/shared/src/main/kotlin/aquadx/sega/diva/model/common/collection/ClearTally.kt @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.diva.model.common.collection +package aquadx.sega.diva.model.common.collection import ext.csv -import icu.samnyan.aqua.sega.diva.model.Internalizable +import aquadx.sega.diva.model.Internalizable class ClearSet { var clear = 0 diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/common/collection/FestaCollection.kt b/shared/src/main/kotlin/aquadx/sega/diva/model/common/collection/FestaCollection.kt similarity index 87% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/common/collection/FestaCollection.kt rename to shared/src/main/kotlin/aquadx/sega/diva/model/common/collection/FestaCollection.kt index f5a3e6fa..0fc3759d 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/common/collection/FestaCollection.kt +++ b/shared/src/main/kotlin/aquadx/sega/diva/model/common/collection/FestaCollection.kt @@ -1,8 +1,8 @@ -package icu.samnyan.aqua.sega.diva.model.common.collection +package aquadx.sega.diva.model.common.collection -import icu.samnyan.aqua.sega.diva.model.db.gamedata.Festa -import icu.samnyan.aqua.sega.diva.util.DivaTime.getString -import icu.samnyan.aqua.sega.diva.util.URIEncoder.encode +import aquadx.sega.diva.model.db.gamedata.Festa +import aquadx.sega.diva.util.DivaTime.getString +import aquadx.sega.diva.util.URIEncoder.encode class FestaCollection { var firstFesta = Festa() diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/common/collection/PsRankingCollection.kt b/shared/src/main/kotlin/aquadx/sega/diva/model/common/collection/PsRankingCollection.kt similarity index 76% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/common/collection/PsRankingCollection.kt rename to shared/src/main/kotlin/aquadx/sega/diva/model/common/collection/PsRankingCollection.kt index 4463701d..28a8dd34 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/common/collection/PsRankingCollection.kt +++ b/shared/src/main/kotlin/aquadx/sega/diva/model/common/collection/PsRankingCollection.kt @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.diva.model.common.collection +package aquadx.sega.diva.model.common.collection -import icu.samnyan.aqua.sega.diva.model.common.Edition -import icu.samnyan.aqua.sega.diva.model.db.userdata.PlayerPvRecord +import aquadx.sega.diva.model.common.Edition +import aquadx.sega.diva.model.db.userdata.PlayerPvRecord class PsRankingCollection(pvId: Int, edition: Edition, list: MutableList) { diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/gamedata/Contest.kt b/shared/src/main/kotlin/aquadx/sega/diva/model/db/gamedata/Contest.kt similarity index 93% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/gamedata/Contest.kt rename to shared/src/main/kotlin/aquadx/sega/diva/model/db/gamedata/Contest.kt index e0b978f0..b5dccbae 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/gamedata/Contest.kt +++ b/shared/src/main/kotlin/aquadx/sega/diva/model/db/gamedata/Contest.kt @@ -1,10 +1,10 @@ -package icu.samnyan.aqua.sega.diva.model.db.gamedata +package aquadx.sega.diva.model.db.gamedata import ext.csv -import icu.samnyan.aqua.sega.diva.model.common.ContestLeague -import icu.samnyan.aqua.sega.diva.model.common.ContestNormaType -import icu.samnyan.aqua.sega.diva.util.DivaTime -import icu.samnyan.aqua.sega.diva.util.URIEncoder +import aquadx.sega.diva.model.common.ContestLeague +import aquadx.sega.diva.model.common.ContestNormaType +import aquadx.sega.diva.util.DivaTime +import aquadx.sega.diva.util.URIEncoder import jakarta.persistence.* import java.io.Serializable import java.time.LocalDateTime diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/gamedata/Difficulty.kt b/shared/src/main/kotlin/aquadx/sega/diva/model/db/gamedata/Difficulty.kt similarity index 93% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/gamedata/Difficulty.kt rename to shared/src/main/kotlin/aquadx/sega/diva/model/db/gamedata/Difficulty.kt index acc79b79..2cf7db0e 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/gamedata/Difficulty.kt +++ b/shared/src/main/kotlin/aquadx/sega/diva/model/db/gamedata/Difficulty.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.diva.model.db.gamedata +package aquadx.sega.diva.model.db.gamedata import com.fasterxml.jackson.annotation.JsonIgnore import jakarta.persistence.* diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/gamedata/DivaCustomize.kt b/shared/src/main/kotlin/aquadx/sega/diva/model/db/gamedata/DivaCustomize.kt similarity index 75% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/gamedata/DivaCustomize.kt rename to shared/src/main/kotlin/aquadx/sega/diva/model/db/gamedata/DivaCustomize.kt index 9e973a33..aeecee99 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/gamedata/DivaCustomize.kt +++ b/shared/src/main/kotlin/aquadx/sega/diva/model/db/gamedata/DivaCustomize.kt @@ -1,8 +1,8 @@ -package icu.samnyan.aqua.sega.diva.model.db.gamedata +package aquadx.sega.diva.model.db.gamedata -import icu.samnyan.aqua.sega.diva.model.Internalizable -import icu.samnyan.aqua.sega.diva.util.DivaTime -import icu.samnyan.aqua.sega.diva.util.URIEncoder +import aquadx.sega.diva.model.Internalizable +import aquadx.sega.diva.util.DivaTime +import aquadx.sega.diva.util.URIEncoder import jakarta.persistence.Entity import jakarta.persistence.Id import jakarta.persistence.Table diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/gamedata/DivaModule.kt b/shared/src/main/kotlin/aquadx/sega/diva/model/db/gamedata/DivaModule.kt similarity index 74% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/gamedata/DivaModule.kt rename to shared/src/main/kotlin/aquadx/sega/diva/model/db/gamedata/DivaModule.kt index 8e88857a..32996382 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/gamedata/DivaModule.kt +++ b/shared/src/main/kotlin/aquadx/sega/diva/model/db/gamedata/DivaModule.kt @@ -1,8 +1,8 @@ -package icu.samnyan.aqua.sega.diva.model.db.gamedata +package aquadx.sega.diva.model.db.gamedata -import icu.samnyan.aqua.sega.diva.model.Internalizable -import icu.samnyan.aqua.sega.diva.util.DivaTime -import icu.samnyan.aqua.sega.diva.util.URIEncoder +import aquadx.sega.diva.model.Internalizable +import aquadx.sega.diva.util.DivaTime +import aquadx.sega.diva.util.URIEncoder import jakarta.persistence.Entity import jakarta.persistence.Id import jakarta.persistence.Table diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/gamedata/Festa.kt b/shared/src/main/kotlin/aquadx/sega/diva/model/db/gamedata/Festa.kt similarity index 83% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/gamedata/Festa.kt rename to shared/src/main/kotlin/aquadx/sega/diva/model/db/gamedata/Festa.kt index 2f5cc654..26f12a33 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/gamedata/Festa.kt +++ b/shared/src/main/kotlin/aquadx/sega/diva/model/db/gamedata/Festa.kt @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.diva.model.db.gamedata +package aquadx.sega.diva.model.db.gamedata -import icu.samnyan.aqua.sega.diva.model.common.Difficulty -import icu.samnyan.aqua.sega.diva.model.common.FestaKind +import aquadx.sega.diva.model.common.Difficulty +import aquadx.sega.diva.model.common.FestaKind import jakarta.persistence.* import java.io.Serializable import java.time.LocalDateTime diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/gamedata/Pv.kt b/shared/src/main/kotlin/aquadx/sega/diva/model/db/gamedata/Pv.kt similarity index 91% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/gamedata/Pv.kt rename to shared/src/main/kotlin/aquadx/sega/diva/model/db/gamedata/Pv.kt index 02f8f6cc..a56dddd6 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/gamedata/Pv.kt +++ b/shared/src/main/kotlin/aquadx/sega/diva/model/db/gamedata/Pv.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.diva.model.db.gamedata +package aquadx.sega.diva.model.db.gamedata import jakarta.persistence.* import java.io.Serializable diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/gamedata/PvEntry.kt b/shared/src/main/kotlin/aquadx/sega/diva/model/db/gamedata/PvEntry.kt similarity index 80% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/gamedata/PvEntry.kt rename to shared/src/main/kotlin/aquadx/sega/diva/model/db/gamedata/PvEntry.kt index 0eb60967..1ac066fd 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/gamedata/PvEntry.kt +++ b/shared/src/main/kotlin/aquadx/sega/diva/model/db/gamedata/PvEntry.kt @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.diva.model.db.gamedata +package aquadx.sega.diva.model.db.gamedata -import icu.samnyan.aqua.sega.diva.model.common.Difficulty -import icu.samnyan.aqua.sega.diva.model.common.Edition +import aquadx.sega.diva.model.common.Difficulty +import aquadx.sega.diva.model.common.Edition import jakarta.persistence.* import java.io.Serializable import java.time.LocalDateTime diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/userdata/GameSession.kt b/shared/src/main/kotlin/aquadx/sega/diva/model/db/userdata/GameSession.kt similarity index 93% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/userdata/GameSession.kt rename to shared/src/main/kotlin/aquadx/sega/diva/model/db/userdata/GameSession.kt index c3fed1e5..a3dbc644 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/userdata/GameSession.kt +++ b/shared/src/main/kotlin/aquadx/sega/diva/model/db/userdata/GameSession.kt @@ -1,6 +1,6 @@ -package icu.samnyan.aqua.sega.diva.model.db.userdata +package aquadx.sega.diva.model.db.userdata -import icu.samnyan.aqua.sega.diva.model.common.StartMode +import aquadx.sega.diva.model.common.StartMode import jakarta.persistence.* import java.io.Serializable import java.time.LocalDateTime diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/userdata/PlayLog.kt b/shared/src/main/kotlin/aquadx/sega/diva/model/db/userdata/PlayLog.kt similarity index 93% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/userdata/PlayLog.kt rename to shared/src/main/kotlin/aquadx/sega/diva/model/db/userdata/PlayLog.kt index 0c79f6c6..197c494c 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/userdata/PlayLog.kt +++ b/shared/src/main/kotlin/aquadx/sega/diva/model/db/userdata/PlayLog.kt @@ -1,10 +1,10 @@ -package icu.samnyan.aqua.sega.diva.model.db.userdata +package aquadx.sega.diva.model.db.userdata import com.fasterxml.jackson.annotation.JsonIgnore -import icu.samnyan.aqua.sega.diva.model.common.ChallengeKind -import icu.samnyan.aqua.sega.diva.model.common.ClearResult -import icu.samnyan.aqua.sega.diva.model.common.Difficulty -import icu.samnyan.aqua.sega.diva.model.common.Edition +import aquadx.sega.diva.model.common.ChallengeKind +import aquadx.sega.diva.model.common.ClearResult +import aquadx.sega.diva.model.common.Difficulty +import aquadx.sega.diva.model.common.Edition import jakarta.persistence.* import java.io.Serializable import java.time.LocalDateTime diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/userdata/PlayerContest.kt b/shared/src/main/kotlin/aquadx/sega/diva/model/db/userdata/PlayerContest.kt similarity index 88% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/userdata/PlayerContest.kt rename to shared/src/main/kotlin/aquadx/sega/diva/model/db/userdata/PlayerContest.kt index ca00f302..4afcf497 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/userdata/PlayerContest.kt +++ b/shared/src/main/kotlin/aquadx/sega/diva/model/db/userdata/PlayerContest.kt @@ -1,6 +1,6 @@ -package icu.samnyan.aqua.sega.diva.model.db.userdata +package aquadx.sega.diva.model.db.userdata -import icu.samnyan.aqua.sega.diva.model.common.ContestBorder +import aquadx.sega.diva.model.common.ContestBorder import jakarta.persistence.* import java.io.Serializable import java.time.LocalDateTime diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/userdata/PlayerCustomize.kt b/shared/src/main/kotlin/aquadx/sega/diva/model/db/userdata/PlayerCustomize.kt similarity index 92% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/userdata/PlayerCustomize.kt rename to shared/src/main/kotlin/aquadx/sega/diva/model/db/userdata/PlayerCustomize.kt index a59ae4d8..1c2d912a 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/userdata/PlayerCustomize.kt +++ b/shared/src/main/kotlin/aquadx/sega/diva/model/db/userdata/PlayerCustomize.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.diva.model.db.userdata +package aquadx.sega.diva.model.db.userdata import jakarta.persistence.* import java.io.Serializable diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/userdata/PlayerInventory.kt b/shared/src/main/kotlin/aquadx/sega/diva/model/db/userdata/PlayerInventory.kt similarity index 93% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/userdata/PlayerInventory.kt rename to shared/src/main/kotlin/aquadx/sega/diva/model/db/userdata/PlayerInventory.kt index 6d7e7901..7e04e87b 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/userdata/PlayerInventory.kt +++ b/shared/src/main/kotlin/aquadx/sega/diva/model/db/userdata/PlayerInventory.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.diva.model.db.userdata +package aquadx.sega.diva.model.db.userdata import com.fasterxml.jackson.annotation.JsonIgnore import jakarta.persistence.* diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/userdata/PlayerModule.kt b/shared/src/main/kotlin/aquadx/sega/diva/model/db/userdata/PlayerModule.kt similarity index 92% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/userdata/PlayerModule.kt rename to shared/src/main/kotlin/aquadx/sega/diva/model/db/userdata/PlayerModule.kt index 9cc691bd..cf35b06d 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/userdata/PlayerModule.kt +++ b/shared/src/main/kotlin/aquadx/sega/diva/model/db/userdata/PlayerModule.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.diva.model.db.userdata +package aquadx.sega.diva.model.db.userdata import jakarta.persistence.* import java.io.Serializable diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/userdata/PlayerProfile.kt b/shared/src/main/kotlin/aquadx/sega/diva/model/db/userdata/PlayerProfile.kt similarity index 97% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/userdata/PlayerProfile.kt rename to shared/src/main/kotlin/aquadx/sega/diva/model/db/userdata/PlayerProfile.kt index d6213f65..5017b771 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/userdata/PlayerProfile.kt +++ b/shared/src/main/kotlin/aquadx/sega/diva/model/db/userdata/PlayerProfile.kt @@ -1,8 +1,8 @@ -package icu.samnyan.aqua.sega.diva.model.db.userdata +package aquadx.sega.diva.model.db.userdata import com.fasterxml.jackson.annotation.JsonIgnore -import icu.samnyan.aqua.sega.diva.model.common.* -import icu.samnyan.aqua.sega.diva.util.DivaStringUtils.getDummyString +import aquadx.sega.diva.model.common.* +import aquadx.sega.diva.util.DivaStringUtils.getDummyString import jakarta.persistence.* import java.io.Serializable import java.time.LocalDateTime diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/userdata/PlayerPvCustomize.kt b/shared/src/main/kotlin/aquadx/sega/diva/model/db/userdata/PlayerPvCustomize.kt similarity index 94% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/userdata/PlayerPvCustomize.kt rename to shared/src/main/kotlin/aquadx/sega/diva/model/db/userdata/PlayerPvCustomize.kt index 3e5d276e..20890261 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/userdata/PlayerPvCustomize.kt +++ b/shared/src/main/kotlin/aquadx/sega/diva/model/db/userdata/PlayerPvCustomize.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.diva.model.db.userdata +package aquadx.sega.diva.model.db.userdata import com.fasterxml.jackson.annotation.JsonIgnore import jakarta.persistence.* diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/userdata/PlayerPvRecord.kt b/shared/src/main/kotlin/aquadx/sega/diva/model/db/userdata/PlayerPvRecord.kt similarity index 82% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/userdata/PlayerPvRecord.kt rename to shared/src/main/kotlin/aquadx/sega/diva/model/db/userdata/PlayerPvRecord.kt index 64168803..db008238 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/userdata/PlayerPvRecord.kt +++ b/shared/src/main/kotlin/aquadx/sega/diva/model/db/userdata/PlayerPvRecord.kt @@ -1,10 +1,10 @@ -package icu.samnyan.aqua.sega.diva.model.db.userdata +package aquadx.sega.diva.model.db.userdata import com.fasterxml.jackson.annotation.JsonIgnore -import icu.samnyan.aqua.sega.diva.model.common.ChallengeKind -import icu.samnyan.aqua.sega.diva.model.common.ClearResult -import icu.samnyan.aqua.sega.diva.model.common.Difficulty -import icu.samnyan.aqua.sega.diva.model.common.Edition +import aquadx.sega.diva.model.common.ChallengeKind +import aquadx.sega.diva.model.common.ClearResult +import aquadx.sega.diva.model.common.Difficulty +import aquadx.sega.diva.model.common.Edition import jakarta.persistence.* import java.io.Serializable diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/userdata/PlayerScreenShot.kt b/shared/src/main/kotlin/aquadx/sega/diva/model/db/userdata/PlayerScreenShot.kt similarity index 93% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/userdata/PlayerScreenShot.kt rename to shared/src/main/kotlin/aquadx/sega/diva/model/db/userdata/PlayerScreenShot.kt index 01d0caed..28d6b989 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/model/db/userdata/PlayerScreenShot.kt +++ b/shared/src/main/kotlin/aquadx/sega/diva/model/db/userdata/PlayerScreenShot.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.diva.model.db.userdata +package aquadx.sega.diva.model.db.userdata import jakarta.persistence.* diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/util/DivaUtils.kt b/shared/src/main/kotlin/aquadx/sega/diva/util/DivaUtils.kt similarity index 96% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/util/DivaUtils.kt rename to shared/src/main/kotlin/aquadx/sega/diva/util/DivaUtils.kt index 6bdea64d..e4fe4946 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/diva/util/DivaUtils.kt +++ b/shared/src/main/kotlin/aquadx/sega/diva/util/DivaUtils.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.diva.util +package aquadx.sega.diva.util import com.fasterxml.jackson.core.JsonGenerator import com.fasterxml.jackson.databind.SerializerProvider diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/general/IntegerListConverter.kt b/shared/src/main/kotlin/aquadx/sega/general/IntegerListConverter.kt similarity index 91% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/general/IntegerListConverter.kt rename to shared/src/main/kotlin/aquadx/sega/general/IntegerListConverter.kt index 74adde13..3f1c3518 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/general/IntegerListConverter.kt +++ b/shared/src/main/kotlin/aquadx/sega/general/IntegerListConverter.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.general +package aquadx.sega.general import ext.ls import jakarta.persistence.AttributeConverter diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/general/model/Card.kt b/shared/src/main/kotlin/aquadx/sega/general/model/Card.kt similarity index 96% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/general/model/Card.kt rename to shared/src/main/kotlin/aquadx/sega/general/model/Card.kt index fcd0183f..3e29c689 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/general/model/Card.kt +++ b/shared/src/main/kotlin/aquadx/sega/general/model/Card.kt @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.general.model +package aquadx.sega.general.model import com.fasterxml.jackson.annotation.JsonIgnore -import icu.samnyan.aqua.net.db.AquaNetUser +import aquadx.net.db.AquaNetUser import jakarta.persistence.* import java.time.LocalDateTime diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/general/model/CardTimestamp.kt b/shared/src/main/kotlin/aquadx/sega/general/model/CardTimestamp.kt similarity index 82% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/general/model/CardTimestamp.kt rename to shared/src/main/kotlin/aquadx/sega/general/model/CardTimestamp.kt index 1a16e183..2508d645 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/general/model/CardTimestamp.kt +++ b/shared/src/main/kotlin/aquadx/sega/general/model/CardTimestamp.kt @@ -1,6 +1,6 @@ -package icu.samnyan.aqua.sega.general.model +package aquadx.sega.general.model -import icu.samnyan.aqua.net.games.BaseEntity +import aquadx.net.games.BaseEntity import jakarta.persistence.Column import jakarta.persistence.Entity import jakarta.persistence.Table diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/general/model/PropertyEntry.kt b/shared/src/main/kotlin/aquadx/sega/general/model/PropertyEntry.kt similarity index 92% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/general/model/PropertyEntry.kt rename to shared/src/main/kotlin/aquadx/sega/general/model/PropertyEntry.kt index 2fe3d55f..5c1598e9 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/general/model/PropertyEntry.kt +++ b/shared/src/main/kotlin/aquadx/sega/general/model/PropertyEntry.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.general.model +package aquadx.sega.general.model import jakarta.persistence.* diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/general/model/UserRecentRating.kt b/shared/src/main/kotlin/aquadx/sega/general/model/UserRecentRating.kt similarity index 82% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/general/model/UserRecentRating.kt rename to shared/src/main/kotlin/aquadx/sega/general/model/UserRecentRating.kt index 2ae8f069..1a4fa937 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/general/model/UserRecentRating.kt +++ b/shared/src/main/kotlin/aquadx/sega/general/model/UserRecentRating.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.general.model +package aquadx.sega.general.model class UserRecentRating( val musicId: Int = 0, diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/model/GameDataEntities.kt b/shared/src/main/kotlin/aquadx/sega/maimai2/model/GameDataEntities.kt similarity index 94% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/model/GameDataEntities.kt rename to shared/src/main/kotlin/aquadx/sega/maimai2/model/GameDataEntities.kt index 984b6926..7ad68c2c 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/model/GameDataEntities.kt +++ b/shared/src/main/kotlin/aquadx/sega/maimai2/model/GameDataEntities.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.maimai2.model +package aquadx.sega.maimai2.model import com.fasterxml.jackson.annotation.JsonIgnore diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/model/UserRating.kt b/shared/src/main/kotlin/aquadx/sega/maimai2/model/UserRating.kt similarity index 64% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/model/UserRating.kt rename to shared/src/main/kotlin/aquadx/sega/maimai2/model/UserRating.kt index 5639e410..84670207 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/model/UserRating.kt +++ b/shared/src/main/kotlin/aquadx/sega/maimai2/model/UserRating.kt @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.maimai2.model +package aquadx.sega.maimai2.model -import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2UserRate -import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2UserUdemae +import aquadx.sega.maimai2.model.userdata.Mai2UserRate +import aquadx.sega.maimai2.model.userdata.Mai2UserUdemae class UserRating { var rating = 0 diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/model/UserRivalMusic.kt b/shared/src/main/kotlin/aquadx/sega/maimai2/model/UserRivalMusic.kt similarity index 84% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/model/UserRivalMusic.kt rename to shared/src/main/kotlin/aquadx/sega/maimai2/model/UserRivalMusic.kt index cdadd70b..8d6293b5 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/model/UserRivalMusic.kt +++ b/shared/src/main/kotlin/aquadx/sega/maimai2/model/UserRivalMusic.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.maimai2.model +package aquadx.sega.maimai2.model class UserRivalMusic( var musicId: Int, diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/model/request/Mai2UpsertUserAll.kt b/shared/src/main/kotlin/aquadx/sega/maimai2/model/request/Mai2UpsertUserAll.kt similarity index 91% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/model/request/Mai2UpsertUserAll.kt rename to shared/src/main/kotlin/aquadx/sega/maimai2/model/request/Mai2UpsertUserAll.kt index 2ad0a8fe..32e07752 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/model/request/Mai2UpsertUserAll.kt +++ b/shared/src/main/kotlin/aquadx/sega/maimai2/model/request/Mai2UpsertUserAll.kt @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.maimai2.model.request +package aquadx.sega.maimai2.model.request -import icu.samnyan.aqua.sega.maimai2.model.UserRating -import icu.samnyan.aqua.sega.maimai2.model.userdata.* +import aquadx.sega.maimai2.model.UserRating +import aquadx.sega.maimai2.model.userdata.* class Mai2UpsertUserAll( var userId: Long, diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/model/request/Mai2UserPhoto.kt b/shared/src/main/kotlin/aquadx/sega/maimai2/model/request/Mai2UserPhoto.kt similarity index 91% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/model/request/Mai2UserPhoto.kt rename to shared/src/main/kotlin/aquadx/sega/maimai2/model/request/Mai2UserPhoto.kt index 8ace5b2b..16706db8 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/model/request/Mai2UserPhoto.kt +++ b/shared/src/main/kotlin/aquadx/sega/maimai2/model/request/Mai2UserPhoto.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.maimai2.model.request +package aquadx.sega.maimai2.model.request class Mai2UserPhoto { var orderId = 0 diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/model/userdata/Mai2UserDetail.kt b/shared/src/main/kotlin/aquadx/sega/maimai2/model/userdata/Mai2UserDetail.kt similarity index 93% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/model/userdata/Mai2UserDetail.kt rename to shared/src/main/kotlin/aquadx/sega/maimai2/model/userdata/Mai2UserDetail.kt index a5903a96..7207e287 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/model/userdata/Mai2UserDetail.kt +++ b/shared/src/main/kotlin/aquadx/sega/maimai2/model/userdata/Mai2UserDetail.kt @@ -1,14 +1,14 @@ -package icu.samnyan.aqua.sega.maimai2.model.userdata +package aquadx.sega.maimai2.model.userdata import com.fasterxml.jackson.annotation.JsonIgnore import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.databind.annotation.JsonSerialize -import icu.samnyan.aqua.net.games.BaseEntity -import icu.samnyan.aqua.net.games.IUserData -import icu.samnyan.aqua.sega.general.IntegerListConverter -import icu.samnyan.aqua.sega.general.model.Card -import icu.samnyan.aqua.sega.util.AccessCodeSerializer +import aquadx.net.games.BaseEntity +import aquadx.net.games.IUserData +import aquadx.sega.general.IntegerListConverter +import aquadx.sega.general.model.Card +import aquadx.sega.util.AccessCodeSerializer import jakarta.persistence.* @Entity(name = "Maimai2UserData") diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/model/userdata/UserEntities.kt b/shared/src/main/kotlin/aquadx/sega/maimai2/model/userdata/UserEntities.kt similarity index 97% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/model/userdata/UserEntities.kt rename to shared/src/main/kotlin/aquadx/sega/maimai2/model/userdata/UserEntities.kt index 4d39264c..d48cf49a 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/maimai2/model/userdata/UserEntities.kt +++ b/shared/src/main/kotlin/aquadx/sega/maimai2/model/userdata/UserEntities.kt @@ -1,6 +1,6 @@ @file:Suppress("unused") -package icu.samnyan.aqua.sega.maimai2.model.userdata +package aquadx.sega.maimai2.model.userdata import com.fasterxml.jackson.annotation.JsonIgnore import com.fasterxml.jackson.annotation.JsonInclude @@ -10,11 +10,11 @@ import com.fasterxml.jackson.databind.JsonSerializer import com.fasterxml.jackson.databind.SerializerProvider import com.fasterxml.jackson.databind.annotation.JsonSerialize import ext.toJson -import icu.samnyan.aqua.net.games.BaseEntity -import icu.samnyan.aqua.net.games.IGenericGamePlaylog -import icu.samnyan.aqua.net.games.IGenericUserMusic -import icu.samnyan.aqua.net.games.IUserEntity -import icu.samnyan.aqua.sega.general.IntegerListConverter +import aquadx.net.games.BaseEntity +import aquadx.net.games.IGenericGamePlaylog +import aquadx.net.games.IGenericUserMusic +import aquadx.net.games.IUserEntity +import aquadx.sega.general.IntegerListConverter import jakarta.persistence.* import java.time.LocalDate import java.time.LocalDateTime diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/ongeki/model/OngekiEnums.kt b/shared/src/main/kotlin/aquadx/sega/ongeki/model/OngekiEnums.kt similarity index 94% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/ongeki/model/OngekiEnums.kt rename to shared/src/main/kotlin/aquadx/sega/ongeki/model/OngekiEnums.kt index 60643a4a..bd883074 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/ongeki/model/OngekiEnums.kt +++ b/shared/src/main/kotlin/aquadx/sega/ongeki/model/OngekiEnums.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.ongeki.model +package aquadx.sega.ongeki.model import com.fasterxml.jackson.annotation.JsonValue diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/ongeki/model/OngekiGameEntities.kt b/shared/src/main/kotlin/aquadx/sega/ongeki/model/OngekiGameEntities.kt similarity index 98% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/ongeki/model/OngekiGameEntities.kt rename to shared/src/main/kotlin/aquadx/sega/ongeki/model/OngekiGameEntities.kt index 47c50725..92d8755a 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/ongeki/model/OngekiGameEntities.kt +++ b/shared/src/main/kotlin/aquadx/sega/ongeki/model/OngekiGameEntities.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.ongeki.model +package aquadx.sega.ongeki.model import com.fasterxml.jackson.annotation.JsonProperty diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/ongeki/model/OngekiUpsertCM.kt b/shared/src/main/kotlin/aquadx/sega/ongeki/model/OngekiUpsertCM.kt similarity index 97% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/ongeki/model/OngekiUpsertCM.kt rename to shared/src/main/kotlin/aquadx/sega/ongeki/model/OngekiUpsertCM.kt index 3a748532..fd6a684a 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/ongeki/model/OngekiUpsertCM.kt +++ b/shared/src/main/kotlin/aquadx/sega/ongeki/model/OngekiUpsertCM.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.ongeki.model +package aquadx.sega.ongeki.model class OngekiCMUpsertUserGacha { var userData: List? = null diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/ongeki/model/OngekiUpsertUserAll.kt b/shared/src/main/kotlin/aquadx/sega/ongeki/model/OngekiUpsertUserAll.kt similarity index 97% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/ongeki/model/OngekiUpsertUserAll.kt rename to shared/src/main/kotlin/aquadx/sega/ongeki/model/OngekiUpsertUserAll.kt index 2ca86841..56128efc 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/ongeki/model/OngekiUpsertUserAll.kt +++ b/shared/src/main/kotlin/aquadx/sega/ongeki/model/OngekiUpsertUserAll.kt @@ -1,5 +1,5 @@ -package icu.samnyan.aqua.sega.ongeki.model -import icu.samnyan.aqua.sega.general.model.UserRecentRating +package aquadx.sega.ongeki.model +import aquadx.sega.general.model.UserRecentRating class OngekiUpsertUserAll { var userData: List? = null diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/ongeki/model/OngekiUserEntities.kt b/shared/src/main/kotlin/aquadx/sega/ongeki/model/OngekiUserEntities.kt similarity index 98% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/ongeki/model/OngekiUserEntities.kt rename to shared/src/main/kotlin/aquadx/sega/ongeki/model/OngekiUserEntities.kt index 354e2b0b..66fc68ee 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/ongeki/model/OngekiUserEntities.kt +++ b/shared/src/main/kotlin/aquadx/sega/ongeki/model/OngekiUserEntities.kt @@ -1,11 +1,11 @@ -package icu.samnyan.aqua.sega.ongeki.model +package aquadx.sega.ongeki.model import com.fasterxml.jackson.annotation.JsonIgnore import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.databind.annotation.JsonSerialize -import icu.samnyan.aqua.net.games.* -import icu.samnyan.aqua.sega.general.model.Card -import icu.samnyan.aqua.sega.util.AccessCodeSerializer +import aquadx.net.games.* +import aquadx.sega.general.model.Card +import aquadx.sega.util.AccessCodeSerializer import jakarta.persistence.* import java.time.LocalDate import java.time.LocalDateTime diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/util/Serializers.kt b/shared/src/main/kotlin/aquadx/sega/util/Serializers.kt similarity index 95% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/util/Serializers.kt rename to shared/src/main/kotlin/aquadx/sega/util/Serializers.kt index 05a2ff7a..ed724297 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/util/Serializers.kt +++ b/shared/src/main/kotlin/aquadx/sega/util/Serializers.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.util +package aquadx.sega.util import com.fasterxml.jackson.core.JsonGenerator import com.fasterxml.jackson.core.JsonParser @@ -8,7 +8,7 @@ import com.fasterxml.jackson.databind.JsonDeserializer import com.fasterxml.jackson.databind.SerializerProvider import com.fasterxml.jackson.databind.ser.std.StdSerializer import ext.int -import icu.samnyan.aqua.sega.general.model.Card +import aquadx.sega.general.model.Card import java.time.ZonedDateTime class AccessCodeSerializer @JvmOverloads constructor(t: Class? = null) : StdSerializer(t) { diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/util/ZLib.kt b/shared/src/main/kotlin/aquadx/sega/util/ZLib.kt similarity index 95% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/util/ZLib.kt rename to shared/src/main/kotlin/aquadx/sega/util/ZLib.kt index 81ad61f5..0703a9f0 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/util/ZLib.kt +++ b/shared/src/main/kotlin/aquadx/sega/util/ZLib.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.util +package aquadx.sega.util import java.io.ByteArrayOutputStream import java.util.zip.Deflater diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/wacca/Constants.kt b/shared/src/main/kotlin/aquadx/sega/wacca/Constants.kt similarity index 95% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/wacca/Constants.kt rename to shared/src/main/kotlin/aquadx/sega/wacca/Constants.kt index 576ccfd4..99a9d4bd 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/wacca/Constants.kt +++ b/shared/src/main/kotlin/aquadx/sega/wacca/Constants.kt @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.wacca +package aquadx.sega.wacca -import icu.samnyan.aqua.sega.wacca.model.db.WaccaUser -import icu.samnyan.aqua.sega.wacca.model.db.WcUserItem +import aquadx.sega.wacca.model.db.WaccaUser +import aquadx.sega.wacca.model.db.WcUserItem enum class WaccaGrades(val value: Int) { D(1), diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/wacca/model/ApiModels.kt b/shared/src/main/kotlin/aquadx/sega/wacca/model/ApiModels.kt similarity index 81% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/wacca/model/ApiModels.kt rename to shared/src/main/kotlin/aquadx/sega/wacca/model/ApiModels.kt index d9ce7626..b0667ffc 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/wacca/model/ApiModels.kt +++ b/shared/src/main/kotlin/aquadx/sega/wacca/model/ApiModels.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.wacca.model +package aquadx.sega.wacca.model open class BaseRequest { var requestNo: Int = 0 diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/wacca/model/db/WaccaUser.kt b/shared/src/main/kotlin/aquadx/sega/wacca/model/db/WaccaUser.kt similarity index 90% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/wacca/model/db/WaccaUser.kt rename to shared/src/main/kotlin/aquadx/sega/wacca/model/db/WaccaUser.kt index c20e60e6..7885e845 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/wacca/model/db/WaccaUser.kt +++ b/shared/src/main/kotlin/aquadx/sega/wacca/model/db/WaccaUser.kt @@ -1,13 +1,13 @@ -package icu.samnyan.aqua.sega.wacca.model.db +package aquadx.sega.wacca.model.db import ext.isoDate import ext.ls import ext.sec import ext.toDate -import icu.samnyan.aqua.net.games.BaseEntity -import icu.samnyan.aqua.net.games.IUserData -import icu.samnyan.aqua.sega.general.IntegerListConverter -import icu.samnyan.aqua.sega.general.model.Card +import aquadx.net.games.BaseEntity +import aquadx.net.games.IUserData +import aquadx.sega.general.IntegerListConverter +import aquadx.sega.general.model.Card import jakarta.persistence.* import java.util.* diff --git a/shared/src/main/kotlin/icu/samnyan/aqua/sega/wacca/model/db/WaccaUserModels.kt b/shared/src/main/kotlin/aquadx/sega/wacca/model/db/WaccaUserModels.kt similarity index 93% rename from shared/src/main/kotlin/icu/samnyan/aqua/sega/wacca/model/db/WaccaUserModels.kt rename to shared/src/main/kotlin/aquadx/sega/wacca/model/db/WaccaUserModels.kt index fe7e7668..055c3a00 100644 --- a/shared/src/main/kotlin/icu/samnyan/aqua/sega/wacca/model/db/WaccaUserModels.kt +++ b/shared/src/main/kotlin/aquadx/sega/wacca/model/db/WaccaUserModels.kt @@ -1,13 +1,13 @@ -package icu.samnyan.aqua.sega.wacca.model.db +package aquadx.sega.wacca.model.db import com.fasterxml.jackson.annotation.JsonIgnore import ext.* -import icu.samnyan.aqua.net.games.BaseEntity -import icu.samnyan.aqua.net.games.IGenericGamePlaylog -import icu.samnyan.aqua.net.games.IGenericUserMusic -import icu.samnyan.aqua.sega.general.IntegerListConverter -import icu.samnyan.aqua.sega.wacca.WaccaItemType -import icu.samnyan.aqua.sega.wacca.WaccaItemType.* +import aquadx.net.games.BaseEntity +import aquadx.net.games.IGenericGamePlaylog +import aquadx.net.games.IGenericUserMusic +import aquadx.sega.general.IntegerListConverter +import aquadx.sega.wacca.WaccaItemType +import aquadx.sega.wacca.WaccaItemType.* import jakarta.persistence.* import java.util.* diff --git a/shared/src/main/kotlin/ext/Ext.kt b/shared/src/main/kotlin/ext/Ext.kt index a7542455..23bf50a8 100644 --- a/shared/src/main/kotlin/ext/Ext.kt +++ b/shared/src/main/kotlin/ext/Ext.kt @@ -2,7 +2,7 @@ package ext -import icu.samnyan.aqua.net.utils.ApiException +import aquadx.net.utils.ApiException import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.slf4j.LoggerFactory diff --git a/shared/src/main/kotlin/ext/Http.kt b/shared/src/main/kotlin/ext/Http.kt index 18fa474d..1897d8f5 100644 --- a/shared/src/main/kotlin/ext/Http.kt +++ b/shared/src/main/kotlin/ext/Http.kt @@ -1,6 +1,6 @@ package ext -import icu.samnyan.aqua.sega.util.ZLib +import aquadx.sega.util.ZLib import java.net.URI import java.net.http.HttpClient import java.net.http.HttpRequest diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/ChusanController.kt b/src/main/java/icu/samnyan/aqua/sega/chusan/ChusanController.kt index 714580eb..a9cb4b9c 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/ChusanController.kt +++ b/src/main/java/icu/samnyan/aqua/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