diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/InitHandlers.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/InitHandlers.kt index 15001446..eb650cbc 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/InitHandlers.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/InitHandlers.kt @@ -2,7 +2,7 @@ package icu.samnyan.aqua.sega.diva.handler import ext.csv import icu.samnyan.aqua.sega.diva.model.BaseRequest -import icu.samnyan.aqua.sega.diva.model.response.operation.PingResponse +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 org.springframework.stereotype.Component diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/CardProcedureHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/CardProcedureHandler.kt index 185a821e..2ab63226 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/CardProcedureHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/CardProcedureHandler.kt @@ -4,7 +4,7 @@ import icu.samnyan.aqua.sega.diva.DivaRepos 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.CardProcedureRequest -import icu.samnyan.aqua.sega.diva.model.response.card.CardProcedureResponse +import icu.samnyan.aqua.sega.diva.model.CardProcedureResponse import icu.samnyan.aqua.sega.diva.model.db.userdata.GameSession import org.springframework.stereotype.Component import java.time.LocalDateTime diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/ChangeNameHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/ChangeNameHandler.kt index 91892e33..378f4ebc 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/ChangeNameHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/ChangeNameHandler.kt @@ -3,7 +3,7 @@ package icu.samnyan.aqua.sega.diva.handler.card import icu.samnyan.aqua.sega.diva.DivaRepos import icu.samnyan.aqua.sega.diva.model.common.Result import icu.samnyan.aqua.sega.diva.model.ChangeNameRequest -import icu.samnyan.aqua.sega.diva.model.response.card.ChangeNameResponse +import icu.samnyan.aqua.sega.diva.model.ChangeNameResponse import org.springframework.stereotype.Component /** diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/ChangePasswdHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/ChangePasswdHandler.kt index cfbd8a1b..67c0f23f 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/ChangePasswdHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/ChangePasswdHandler.kt @@ -4,7 +4,7 @@ import icu.samnyan.aqua.sega.diva.DivaRepos import icu.samnyan.aqua.sega.diva.model.common.PassStat import icu.samnyan.aqua.sega.diva.model.common.Result import icu.samnyan.aqua.sega.diva.model.ChangePasswdRequest -import icu.samnyan.aqua.sega.diva.model.response.card.ChangePasswdResponse +import icu.samnyan.aqua.sega.diva.model.ChangePasswdResponse import org.springframework.stereotype.Component /** diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/RegistrationHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/RegistrationHandler.kt index 518673c4..0199104b 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/RegistrationHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/RegistrationHandler.kt @@ -3,7 +3,7 @@ package icu.samnyan.aqua.sega.diva.handler.card import icu.samnyan.aqua.sega.diva.PlayerProfileService import icu.samnyan.aqua.sega.diva.model.common.Result import icu.samnyan.aqua.sega.diva.model.RegistrationRequest -import icu.samnyan.aqua.sega.diva.model.response.card.RegistrationResponse +import icu.samnyan.aqua.sega.diva.model.RegistrationResponse import org.springframework.stereotype.Component /** diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/ContestInfoHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/ContestInfoHandler.kt index 3fa5eb30..cc0976d2 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/ContestInfoHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/ContestInfoHandler.kt @@ -1,9 +1,9 @@ package icu.samnyan.aqua.sega.diva.handler.databank import icu.samnyan.aqua.sega.diva.DivaRepos -import icu.samnyan.aqua.sega.diva.model.db.gamedata.Contest import icu.samnyan.aqua.sega.diva.model.BaseRequest -import icu.samnyan.aqua.sega.diva.model.response.databank.ContestInfoResponse +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 org.springframework.stereotype.Component import java.time.LocalDateTime diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/FestaInfoHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/FestaInfoHandler.kt index d5cafbe4..104f1a9e 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/FestaInfoHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/FestaInfoHandler.kt @@ -3,7 +3,7 @@ package icu.samnyan.aqua.sega.diva.handler.databank import icu.samnyan.aqua.sega.diva.FestaRepository import icu.samnyan.aqua.sega.diva.model.common.collection.FestaCollection import icu.samnyan.aqua.sega.diva.model.BaseRequest -import icu.samnyan.aqua.sega.diva.model.response.databank.FestaInfoResponse +import icu.samnyan.aqua.sega.diva.model.FestaInfoResponse import org.springframework.stereotype.Component /** diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/NvRankingHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/NvRankingHandler.kt index 702277f5..3ebe8ab6 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/NvRankingHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/NvRankingHandler.kt @@ -1,7 +1,7 @@ package icu.samnyan.aqua.sega.diva.handler.databank import icu.samnyan.aqua.sega.diva.model.BaseRequest -import icu.samnyan.aqua.sega.diva.model.response.databank.NvRankingResponse +import icu.samnyan.aqua.sega.diva.model.NvRankingResponse import org.springframework.stereotype.Component /** diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PsRankingHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PsRankingHandler.kt index b237a8f7..7ef36e62 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PsRankingHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PsRankingHandler.kt @@ -6,7 +6,7 @@ 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.model.PsRankingRequest -import icu.samnyan.aqua.sega.diva.model.response.databank.PsRankingResponse +import icu.samnyan.aqua.sega.diva.model.PsRankingResponse import icu.samnyan.aqua.sega.diva.util.URIEncoder.encode import org.springframework.stereotype.Component import java.time.LocalDateTime diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PvListHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PvListHandler.kt index de7026fa..363a57f4 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PvListHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PvListHandler.kt @@ -4,7 +4,7 @@ import icu.samnyan.aqua.sega.diva.DivaRepos 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.model.BaseRequest -import icu.samnyan.aqua.sega.diva.model.response.databank.PvListResponse +import icu.samnyan.aqua.sega.diva.model.PvListResponse import icu.samnyan.aqua.sega.diva.util.URIEncoder.encode import org.springframework.stereotype.Component import java.time.LocalDateTime diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/ShopCatalogHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/ShopCatalogHandler.kt index c2727b93..b7de67b2 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/ShopCatalogHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/ShopCatalogHandler.kt @@ -2,7 +2,7 @@ package icu.samnyan.aqua.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.response.databank.ShopCatalogResponse +import icu.samnyan.aqua.sega.diva.model.ShopCatalogResponse import icu.samnyan.aqua.sega.diva.util.URIEncoder.encode import org.springframework.stereotype.Component import java.time.LocalDateTime diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/BuyCstmzItmHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/BuyCstmzItmHandler.kt index b2a20ba5..ea89a45d 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/BuyCstmzItmHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/BuyCstmzItmHandler.kt @@ -4,7 +4,7 @@ import ext.invoke import icu.samnyan.aqua.sega.diva.DivaRepos import icu.samnyan.aqua.sega.diva.model.common.Result import icu.samnyan.aqua.sega.diva.model.BuyCstmzItmRequest -import icu.samnyan.aqua.sega.diva.model.response.ingame.BuyCstmzItmResponse +import icu.samnyan.aqua.sega.diva.model.BuyCstmzItmResponse import org.springframework.stereotype.Component /** diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/BuyModuleHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/BuyModuleHandler.kt index c52e3980..cd573bca 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/BuyModuleHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/BuyModuleHandler.kt @@ -3,7 +3,7 @@ package icu.samnyan.aqua.sega.diva.handler.ingame import icu.samnyan.aqua.sega.diva.DivaRepos import icu.samnyan.aqua.sega.diva.model.common.Result import icu.samnyan.aqua.sega.diva.model.BuyModuleRequest -import icu.samnyan.aqua.sega.diva.model.response.ingame.BuyModuleResponse +import icu.samnyan.aqua.sega.diva.model.BuyModuleResponse import org.springframework.stereotype.Component /** diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/GetPvPdHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/GetPvPdHandler.kt index cc2ca22e..473f1cc4 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/GetPvPdHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/GetPvPdHandler.kt @@ -4,7 +4,7 @@ import icu.samnyan.aqua.sega.diva.DivaRepos 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.GetPvPdRequest -import icu.samnyan.aqua.sega.diva.model.response.ingame.GetPvPdResponse +import icu.samnyan.aqua.sega.diva.model.GetPvPdResponse 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 diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/ShopExitHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/ShopExitHandler.kt index 405b05e1..ee750238 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/ShopExitHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/ShopExitHandler.kt @@ -4,7 +4,7 @@ import ext.csv import icu.samnyan.aqua.sega.diva.DivaRepos import icu.samnyan.aqua.sega.diva.model.common.Result import icu.samnyan.aqua.sega.diva.model.ShopExitRequest -import icu.samnyan.aqua.sega.diva.model.response.ingame.ShopExitResponse +import icu.samnyan.aqua.sega.diva.model.ShopExitResponse import icu.samnyan.aqua.sega.diva.model.db.userdata.PlayerPvCustomize import org.springframework.stereotype.Component import java.util.function.Supplier diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StageResultHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StageResultHandler.kt index 4d5c458b..5f79830d 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StageResultHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StageResultHandler.kt @@ -2,10 +2,10 @@ package icu.samnyan.aqua.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.model.StageResultRequest -import icu.samnyan.aqua.sega.diva.model.response.ingame.StageResultResponse import icu.samnyan.aqua.sega.diva.util.DivaCalculator import org.apache.commons.lang3.StringUtils import org.springframework.stereotype.Component @@ -138,8 +138,8 @@ class StageResultHandler(val db: DivaRepos, val calc: DivaCalculator) { // Only if this is the first time reach this value val previousValue = progress.stream().limit((progress.size - 1).toLong()) - .mapToInt { obj: ContestProgress? -> obj!!.getScores() }.sum() - val currentValue = progress.stream().mapToInt { obj: ContestProgress? -> obj!!.getScores() }.sum() + .mapToInt { it.scores }.sum() + val currentValue = progress.stream().mapToInt { it.scores }.sum() // Bronze Reward val bronze = updateReward( @@ -319,11 +319,11 @@ class StageResultHandler(val db: DivaRepos, val calc: DivaCalculator) { private fun getContestSpecifier(progresses: MutableList): kotlin.String { val result: MutableList = LinkedList() for (x in progresses) { - result.add(x.getHardness().toString()) - result.add(x.getEdition().toString()) - result.add(x.getStars().toString()) - result.add(x.getScores().toString()) - result.add(x.getVersion().toString()) + result.add(x.hardness.toString()) + result.add(x.edition.toString()) + result.add(x.stars.toString()) + result.add(x.scores.toString()) + result.add(x.version.toString()) } while (result.size < 60) { result.add("-1") diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/PreStartHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/PreStartHandler.kt index f2542fe9..aa233c65 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/PreStartHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/PreStartHandler.kt @@ -6,7 +6,7 @@ import icu.samnyan.aqua.sega.diva.DivaRepos 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.PreStartRequest -import icu.samnyan.aqua.sega.diva.model.response.user.PreStartResponse +import icu.samnyan.aqua.sega.diva.model.PreStartResponse import icu.samnyan.aqua.sega.diva.model.db.userdata.GameSession import org.springframework.stereotype.Component import java.time.LocalDateTime diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/SpendCreditHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/SpendCreditHandler.kt index b95572cc..748a1b3c 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/SpendCreditHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/SpendCreditHandler.kt @@ -2,7 +2,7 @@ package icu.samnyan.aqua.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.response.user.SpendCreditResponse +import icu.samnyan.aqua.sega.diva.model.SpendCreditResponse import org.springframework.stereotype.Component /** diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/StartHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/StartHandler.kt index d4b8c8d5..08de437c 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/StartHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/StartHandler.kt @@ -8,7 +8,7 @@ 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.model.StartRequest -import icu.samnyan.aqua.sega.diva.model.response.user.StartResponse +import icu.samnyan.aqua.sega.diva.model.StartResponse import icu.samnyan.aqua.sega.diva.util.PvRecordDataException import org.springframework.stereotype.Component import java.time.LocalDateTime diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/DivaResponse.kt b/src/main/java/icu/samnyan/aqua/sega/diva/model/DivaResponse.kt new file mode 100644 index 00000000..cc341d52 --- /dev/null +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/DivaResponse.kt @@ -0,0 +1,599 @@ +@file:Suppress("unused") + +package icu.samnyan.aqua.sega.diva.model + +import icu.samnyan.aqua.sega.diva.model.common.* +import icu.samnyan.aqua.sega.diva.util.URIEncoder +import java.time.LocalDateTime + +class CardProcedureResponse { + var cd_adm_result: Result? + var chg_name_price = 100 + var accept_idx = 0 + var pd_id: Long = 0 + var player_name: String? = null + var lv_num: Int? = null + var lv_pnt: Int? = null + var lv_str: String? = null + var lv_efct_id: Int? = null + var lv_plt_id: Int? = null + var vcld_pts: Int? = null + var passwd_stat: PassStat? = null + + constructor( + cd_adm_result: Result?, + chg_name_price: Int, + accept_idx: Int, + pd_id: Long, + player_name: String?, + lv_num: Int?, + lv_pnt: Int?, + lv_str: String?, + lv_efct_id: Int?, + lv_plt_id: Int?, + vcld_pts: Int?, + passwd_stat: PassStat? + ) { + this.cd_adm_result = cd_adm_result + this.chg_name_price = chg_name_price + this.accept_idx = accept_idx + this.pd_id = pd_id + this.player_name = player_name + this.lv_num = lv_num + this.lv_pnt = lv_pnt + this.lv_str = lv_str + this.lv_efct_id = lv_efct_id + this.lv_plt_id = lv_plt_id + this.vcld_pts = vcld_pts + this.passwd_stat = passwd_stat + } + + constructor(cd_adm_result: Result?) { + this.cd_adm_result = cd_adm_result + } +} + +class ChangeNameResponse( + var cd_adm_result: Result?, + var accept_idx: Int, + var pd_id: Long, + var player_name: String? +) + +class ChangePasswdResponse(var cd_adm_result: Result?, var accept_idx: Int, var pd_id: Long) +class RegistrationResponse(var cd_adm_result: Result?, var pd_id: Long) +class ContestInfoResponse(var ci_lut: LocalDateTime?, var ci_str: String?) +class FestaInfoResponse( + var fi_id: String?, + var fi_name: String?, + var fi_kind: String?, + var fi_difficulty: String?, + var fi_pv_id_lst: String?, + var fi_attr: String?, + var fi_add_vp: String?, + var fi_mul_vp: String?, + var fi_st: String?, + var fi_et: String?, + var fi_lut: String? +) + +class NvRankingResponse( + var rnk_nv_tag_str: String?, + var rnk_nv_ts: LocalDateTime?, + var rnk_nv_data: String?, + var rnk_nv_lut: LocalDateTime? +) + +class PsRankingResponse( + var rnk_ps_lut: LocalDateTime?, + var rnk_ps_ts: LocalDateTime?, + var rnk_ps_dffclty: Int, + var rnk_ps_pv_id: String?, + var rnk_ps_edtn1: String?, + var rnk_ps_edtn2: String?, + var rnk_ps_edtn3: String?, + var rnk_ps_scr1: String?, + var rnk_ps_scr2: String?, + var rnk_ps_scr3: String?, + var rnk_ps_nm1: String?, + var rnk_ps_nm2: String?, + var rnk_ps_nm3: String? +) + +class PvListResponse(var pvl_lut: LocalDateTime?, var pv_lst: String?) +class ShopCatalogResponse(var shp_ctlg_lut: LocalDateTime?, var shp_ctlg: String?) +class BuyCstmzItmResponse { + var shp_rslt: Result? + var cstmz_itm_id = 0 + var cstmz_itm_have: String? = null + var vcld_pts = 0 + + constructor(shp_rslt: Result?, cstmz_itm_id: Int, cstmz_itm_have: String?, vcld_pts: Int) { + this.shp_rslt = shp_rslt + this.cstmz_itm_id = cstmz_itm_id + this.cstmz_itm_have = cstmz_itm_have + this.vcld_pts = vcld_pts + } + + constructor(shp_rslt: Result?) { + this.shp_rslt = shp_rslt + } +} + +class BuyModuleResponse { + var shp_rslt: Result? + var mdl_id = 0 + var mdl_have: String? = null + var vcld_pts = 0 + + constructor(shp_rslt: Result?, mdl_id: Int, mdl_have: String?, vcld_pts: Int) { + this.shp_rslt = shp_rslt + this.mdl_id = mdl_id + this.mdl_have = mdl_have + this.vcld_pts = vcld_pts + } + + constructor(shp_rslt: Result?) { + this.shp_rslt = shp_rslt + } +} + +class GetPvPdResponse(var pd_by_pv_id: String?, var pdddt_flg: Boolean?, var pdddt_tm: String?) +class ShopExitResponse(var shp_rslt: Result?) +class StageResultResponse { + var chllng_kind = 0 + var lv_num_old = 0 + var lv_pnt_old = 0 + var lv_num = 0 + var lv_pnt = 0 + var lv_str: String? = null + var lv_efct_id = 0 + var lv_plt_id = 0 + var vcld_pts = 0 + var prsnt_vcld_pts = 0 + var cnp_cid = 0 + var cnp_var = 0 + var cnp_sp: String? = null + var crwd_kind: String? = "-1,-1,-1" + var crwd_varue: String? = "-1,-1,-1" + var crwd_str_0: String? = "***,***,***" + var crwd_str_1: String? = "***,***,***" + var cerwd_kind = -1 + var cerwd_varue = -1 + var cerwd_str_0: String? = "***" + var cerwd_str_1: String? = "***" + var ttl_str_ary: String? = "xxx" + var ttl_plt_id_ary: String? = "-1,-1,-1,-1,-1" + var ttl_desc_ary: String? = "xxx" + var skin_id_ary: String? = "xxx" + var skin_name_ary: String? = "xxx" + var skin_illust_ary: String? = "xxx" + var skin_desc_ary: String? = "xxx" + var pdddt_flg = 0 + var pdddt_tm: LocalDateTime? = null + var nblss_ltt_stts = -1 + var nblss_ltt_tckt = -1 + var nblss_ltt_is_opn = 0 + var nblss_ltt_prz = 0 + var nblss_ltt_nxt_stts = 0 + var nblss_ltt_nxt_tckt = -1 + var my_qst_id: String? = null + var my_qst_r_qid: String? = null + var my_qst_r_knd: String? = null + var my_qst_r_vl: String? = null + var my_qst_r_nflg: String? = null + var my_ccd_r_qid: String? = null + var my_ccd_r_hnd: String? = null + var my_ccd_r_vp: String? = null + + constructor() + + constructor( + chllng_kind: Int, + lv_num_old: Int, + lv_pnt_old: Int, + lv_num: Int, + lv_pnt: Int, + lv_str: String?, + lv_efct_id: Int, + lv_plt_id: Int, + vcld_pts: Int, + prsnt_vcld_pts: Int, + cnp_cid: Int, + cnp_var: Int, + cnp_sp: String?, + crwd_kind: String?, + crwd_varue: String?, + crwd_str_0: String?, + crwd_str_1: String?, + cerwd_kind: Int, + cerwd_varue: Int, + cerwd_str_0: String?, + cerwd_str_1: String?, + ttl_str_ary: String?, + ttl_plt_id_ary: String?, + ttl_desc_ary: String?, + skin_id_ary: String?, + skin_name_ary: String?, + skin_illust_ary: String?, + skin_desc_ary: String?, + pdddt_flg: Int, + pdddt_tm: LocalDateTime?, + nblss_ltt_stts: Int, + nblss_ltt_tckt: Int, + nblss_ltt_is_opn: Int, + nblss_ltt_prz: Int, + nblss_ltt_nxt_stts: Int, + nblss_ltt_nxt_tckt: Int, + my_qst_id: String?, + my_qst_r_qid: String?, + my_qst_r_knd: String?, + my_qst_r_vl: String?, + my_qst_r_nflg: String?, + my_ccd_r_qid: String?, + my_ccd_r_hnd: String?, + my_ccd_r_vp: String? + ) { + this.chllng_kind = chllng_kind + this.lv_num_old = lv_num_old + this.lv_pnt_old = lv_pnt_old + this.lv_num = lv_num + this.lv_pnt = lv_pnt + this.lv_str = lv_str + this.lv_efct_id = lv_efct_id + this.lv_plt_id = lv_plt_id + this.vcld_pts = vcld_pts + this.prsnt_vcld_pts = prsnt_vcld_pts + this.cnp_cid = cnp_cid + this.cnp_var = cnp_var + this.cnp_sp = cnp_sp + this.crwd_kind = crwd_kind + this.crwd_varue = crwd_varue + this.crwd_str_0 = crwd_str_0 + this.crwd_str_1 = crwd_str_1 + this.cerwd_kind = cerwd_kind + this.cerwd_varue = cerwd_varue + this.cerwd_str_0 = cerwd_str_0 + this.cerwd_str_1 = cerwd_str_1 + this.ttl_str_ary = ttl_str_ary + this.ttl_plt_id_ary = ttl_plt_id_ary + this.ttl_desc_ary = ttl_desc_ary + this.skin_id_ary = skin_id_ary + this.skin_name_ary = skin_name_ary + this.skin_illust_ary = skin_illust_ary + this.skin_desc_ary = skin_desc_ary + this.pdddt_flg = pdddt_flg + this.pdddt_tm = pdddt_tm + this.nblss_ltt_stts = nblss_ltt_stts + this.nblss_ltt_tckt = nblss_ltt_tckt + this.nblss_ltt_is_opn = nblss_ltt_is_opn + this.nblss_ltt_prz = nblss_ltt_prz + this.nblss_ltt_nxt_stts = nblss_ltt_nxt_stts + this.nblss_ltt_nxt_tckt = nblss_ltt_nxt_tckt + this.my_qst_id = my_qst_id + this.my_qst_r_qid = my_qst_r_qid + this.my_qst_r_knd = my_qst_r_knd + this.my_qst_r_vl = my_qst_r_vl + this.my_qst_r_nflg = my_qst_r_nflg + this.my_ccd_r_qid = my_ccd_r_qid + this.my_ccd_r_hnd = my_ccd_r_hnd + this.my_ccd_r_vp = my_ccd_r_vp + } +} + +class PreStartResponse { + var ps_result: PreStartResult? + var accept_idx: Int? = null + var nblss_ltt_stts: Int? = null + var nblss_ltt_tckt: Int? = null + var nblss_ltt_is_opn: Int? = null + + var pd_id: Long = 0 + var player_name: String? = null + var sort_kind: SortMode? = null + var lv_num: Int? = null + var lv_pnt: Int? = null + var lv_str: String? = null + var lv_efct_id: Int? = null + var lv_plt_id: Int? = null + var mdl_eqp_ary: String? = null + var mdl_eqp_tm: LocalDateTime? = null + var skn_eqp: Int? = null + var btn_se_eqp: Int? = null + var sld_se_eqp: Int? = null + var chn_sld_se_eqp: Int? = null + var sldr_tch_se_eqp: Int? = null + var vcld_pts: Int? = null + var passwd_stat: PassStat? = null + + constructor(ps_result: PreStartResult?) { + this.ps_result = ps_result + } + + constructor( + ps_result: PreStartResult?, + accept_idx: Int?, + pd_id: Long, + player_name: String?, + sort_kind: SortMode?, + lv_num: Int?, + lv_pnt: Int?, + lv_str: String?, + lv_efct_id: Int?, + lv_plt_id: Int?, + mdl_eqp_ary: String?, + mdl_eqp_tm: LocalDateTime?, + skn_eqp: Int?, + btn_se_eqp: Int?, + sld_se_eqp: Int?, + chn_sld_se_eqp: Int?, + sldr_tch_se_eqp: Int?, + vcld_pts: Int?, + passwd_stat: PassStat? + ) { + this.ps_result = ps_result + this.accept_idx = accept_idx + this.nblss_ltt_stts = -1 + this.nblss_ltt_tckt = -1 + this.nblss_ltt_is_opn = -1 + this.pd_id = pd_id + this.player_name = player_name + this.sort_kind = sort_kind + this.lv_num = lv_num + this.lv_pnt = lv_pnt + this.lv_str = lv_str + this.lv_efct_id = lv_efct_id + this.lv_plt_id = lv_plt_id + this.mdl_eqp_ary = mdl_eqp_ary + this.mdl_eqp_tm = mdl_eqp_tm + this.skn_eqp = skn_eqp + this.btn_se_eqp = btn_se_eqp + this.sld_se_eqp = sld_se_eqp + this.chn_sld_se_eqp = chn_sld_se_eqp + this.sldr_tch_se_eqp = sldr_tch_se_eqp + this.vcld_pts = vcld_pts + this.passwd_stat = passwd_stat + } +} + +class PingResponse(ping_b_msg: String?, ping_m_msg: String?) { + var ping_b_msg: String? = URIEncoder.encode("Server Running No other news") + var ping_m_msg: String? = URIEncoder.encode("Network Service Running") + var atnd_lut: String? = null + var fi_lut: String? = null + var ci_lut: String? = null + var qi_lut: String? = null + var pvl_lut: String? = null + var pdcl_lut: String? = null + var pnml_lut: String? = null + var cinml_lut: String? = null + var rwl_lut: String? = null + var bdlol_lut: String? = null + var shp_ctlg_lut: String? = null + var cstmz_itm_ctlg_lut: String? = null + var ngwl_lut: String? = null + var rnk_nv_lut: String? = null + var rnk_ps_lut: String? = null + var bi_lut: String? = null + var cpi_lut: String? = null + var p_std_hc_lut: String? = null + var p_std_i_n_lut: String? = null + + var req_inv_cmd_num: String? = null + var req_inv_cmd_prm1: String? = null + var req_inv_cmd_prm2: String? = null + var req_inv_cmd_prm3: String? = null + var req_inv_cmd_prm4: String? = null + + var pow_save_flg = false + + var nblss_dnt_p = 0 + var nblss_ltt_rl_vp = 0 + var nblss_ex_ltt_flg = 0 + + var nblss_dnt_st_tm: String? = null + var nblss_dnt_ed_tm: String? = null + var nblss_ltt_st_tm: String? = null + var nblss_ltt_ed_tm: String? = null + + + init { + this.ping_b_msg = ping_b_msg + this.ping_m_msg = ping_m_msg + } +} + +class SpendCreditResponse( + var cmpgn_rslt: String?, + var cmpgn_rslt_num: Int, + var vcld_pts: Int, + var lv_str: String?, + var lv_efct_id: Int, + var lv_plt_id: Int +) + +class StartResponse( + var pd_id: Long, + start_result: Result?, + accept_idx: Int, + start_idx: Int, + player_name: String?, + hp_vol: Int, + btn_se_vol: Boolean, + btn_se_vol2: Int, + sldr_se_vol2: Int, + sort_kind: SortMode?, + lv_num: Int, + lv_pnt: Int, + lv_str: String?, + lv_efct_id: Int, + lv_plt_id: Int, + mdl_eqp_ary: String?, + c_itm_eqp_ary: String?, + ms_itm_flg_ary: String?, + mdl_eqp_tm: LocalDateTime?, + mdl_have: String?, + cstmz_itm_have: String?, + use_pv_mdl_eqp: Boolean, + use_mdl_pri: Boolean, + use_pv_skn_eqp: Boolean, + use_pv_btn_se_eqp: Boolean, + use_pv_sld_se_eqp: Boolean, + use_pv_chn_sld_se_eqp: Boolean, + use_pv_sldr_tch_se_eqp: Boolean, + vcld_pts: Int, + nxt_pv_id: Int, + nxt_dffclty: Difficulty?, + nxt_edtn: Edition?, + cv_cid: String?, + cv_sc: String?, + cv_rr: String?, + cv_bv: String?, + cv_bf: String?, + cnp_cid: Int, + cnp_var: Int, + cnp_rr: ContestBorder?, + cnp_sp: String?, + my_lst_0: String?, + my_lst_1: String?, + my_lst_2: String?, + my_lst_3: String?, + my_lst_4: String?, + dsp_clr_brdr: String?, + dsp_intrm_rnk: Boolean, + dsp_clr_sts: Boolean, + clr_sts: String?, + rgo_sts: Boolean, + my_qst_id: String?, + my_qst_sts: String?, + my_qst_prgrs: String?, + my_qst_et: String?, + p_std_ie_have: String?, + p_std_se_have: String? +) { + var start_result: Result? = Result.SUCCESS + var accept_idx: Int + var start_idx: Int + var player_name: String? + var hp_vol = 100 + var btn_se_vol = true + var btn_se_vol2 = 100 + var sldr_se_vol2 = 10 + var sort_kind: SortMode? = SortMode.RELEASE_DATE + var lv_num: Int + var lv_pnt: Int + var lv_str: String? + var lv_efct_id: Int + var lv_plt_id: Int + var mdl_eqp_ary: String? + var c_itm_eqp_ary: String? + var ms_itm_flg_ary: String? + var mdl_eqp_tm: LocalDateTime? = LocalDateTime.now() + var mdl_have: String? = Const.ALL_HAVE + var cstmz_itm_have: String? = Const.ALL_HAVE + var use_pv_mdl_eqp = false + var use_mdl_pri = false + var use_pv_skn_eqp = false + var use_pv_btn_se_eqp = false + var use_pv_sld_se_eqp = false + var use_pv_chn_sld_se_eqp = false + var use_pv_sldr_tch_se_eqp = false + var vcld_pts = 300 + var nxt_pv_id = -1 + var nxt_dffclty: Difficulty? = Difficulty.NORMAL + var nxt_edtn: Edition? = Edition.ORIGINAL + + // Contest play history, array of 4 + var cv_cid: String? + var cv_sc: String? + var cv_rr: String? + var cv_bv: String? + var cv_bf: String? + + // Contest now playing id, return -1 if no current playing contest + var cnp_cid = -1 + var cnp_var = 0 + var cnp_rr: ContestBorder? = ContestBorder.NONE + var cnp_sp: String? = "" + + var my_lst_0: String? + var my_lst_1: String? + var my_lst_2: String? + var my_lst_3: String? // Unused + var my_lst_4: String? // Unused + + var dsp_clr_brdr: String? + var dsp_intrm_rnk: Boolean + var dsp_clr_sts: Boolean + + var clr_sts: String? + + var rgo_sts: Boolean + + var my_qst_id: String? + var my_qst_sts: String? + var my_qst_prgrs: String? + var my_qst_et: String? + + var p_std_ie_have: String? = Const.ALL_NOT_HAVE + var p_std_se_have: String? = Const.ALL_NOT_HAVE + + init { + this.start_result = start_result + this.accept_idx = accept_idx + this.start_idx = start_idx + this.player_name = player_name + this.hp_vol = hp_vol + this.btn_se_vol = btn_se_vol + this.btn_se_vol2 = btn_se_vol2 + this.sldr_se_vol2 = sldr_se_vol2 + this.sort_kind = sort_kind + this.lv_num = lv_num + this.lv_pnt = lv_pnt + this.lv_str = lv_str + this.lv_efct_id = lv_efct_id + this.lv_plt_id = lv_plt_id + this.mdl_eqp_ary = mdl_eqp_ary + this.c_itm_eqp_ary = c_itm_eqp_ary + this.ms_itm_flg_ary = ms_itm_flg_ary + this.mdl_eqp_tm = mdl_eqp_tm + this.mdl_have = mdl_have + this.cstmz_itm_have = cstmz_itm_have + this.use_pv_mdl_eqp = use_pv_mdl_eqp + this.use_mdl_pri = use_mdl_pri + this.use_pv_skn_eqp = use_pv_skn_eqp + this.use_pv_btn_se_eqp = use_pv_btn_se_eqp + this.use_pv_sld_se_eqp = use_pv_sld_se_eqp + this.use_pv_chn_sld_se_eqp = use_pv_chn_sld_se_eqp + this.use_pv_sldr_tch_se_eqp = use_pv_sldr_tch_se_eqp + this.vcld_pts = vcld_pts + this.nxt_pv_id = nxt_pv_id + this.nxt_dffclty = nxt_dffclty + this.nxt_edtn = nxt_edtn + this.cv_cid = cv_cid + this.cv_sc = cv_sc + this.cv_rr = cv_rr + this.cv_bv = cv_bv + this.cv_bf = cv_bf + this.cnp_cid = cnp_cid + this.cnp_var = cnp_var + this.cnp_rr = cnp_rr + this.cnp_sp = cnp_sp + this.my_lst_0 = my_lst_0 + this.my_lst_1 = my_lst_1 + this.my_lst_2 = my_lst_2 + this.my_lst_3 = my_lst_3 + this.my_lst_4 = my_lst_4 + this.dsp_clr_brdr = dsp_clr_brdr + this.dsp_intrm_rnk = dsp_intrm_rnk + this.dsp_clr_sts = dsp_clr_sts + this.clr_sts = clr_sts + this.rgo_sts = rgo_sts + this.my_qst_id = my_qst_id + this.my_qst_sts = my_qst_sts + this.my_qst_prgrs = my_qst_prgrs + this.my_qst_et = my_qst_et + this.p_std_ie_have = p_std_ie_have + this.p_std_se_have = p_std_se_have + } +} \ No newline at end of file diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/Internalizable.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/Internalizable.java deleted file mode 100644 index a73145ef..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/Internalizable.java +++ /dev/null @@ -1,8 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -public interface Internalizable { - String toInternal(); -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/Internalizable.kt b/src/main/java/icu/samnyan/aqua/sega/diva/model/Internalizable.kt new file mode 100644 index 00000000..6bc103ca --- /dev/null +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/Internalizable.kt @@ -0,0 +1,8 @@ +package icu.samnyan.aqua.sega.diva.model + +/** + * @author samnyan (privateamusement@protonmail.com) + */ +interface Internalizable { + fun toInternal(): String? +} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/ChallengeKind.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/common/ChallengeKind.java deleted file mode 100644 index ba488190..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/ChallengeKind.java +++ /dev/null @@ -1,35 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.common; - -import com.fasterxml.jackson.annotation.JsonValue; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -public enum ChallengeKind { - UNDEFINED(-1), - CLEAR(0), - GREAT(1), - EXCELLENT(2), - PERFECT(3), - COMPLETED(4); - - - private final int value; - - ChallengeKind(int i) { - this.value = i; - } - - public static ChallengeKind fromValue(int i) { - for (ChallengeKind challengeKind : - ChallengeKind.values()) { - if (challengeKind.getValue() == i) return challengeKind; - } - return ChallengeKind.UNDEFINED; - } - - @JsonValue - public int getValue() { - return value; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/ClearResult.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/common/ClearResult.java deleted file mode 100644 index 1c3eb44b..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/ClearResult.java +++ /dev/null @@ -1,36 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.common; - -import com.fasterxml.jackson.annotation.JsonValue; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -public enum ClearResult implements ValueEnum { - NO_CLEAR(-1), - MISS_TAKE(0), - CHEAP(1), - STANDARD(2), - GREAT(3), - EXCELLENT(4), - PERFECT(5); - - - private final int value; - - ClearResult(int i) { - this.value = i; - } - - public static ClearResult fromValue(int i) { - for (ClearResult clearResult : - ClearResult.values()) { - if (clearResult.getValue() == i) return clearResult; - } - return ClearResult.NO_CLEAR; - } - - @JsonValue - public int getValue() { - return value; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/Const.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/common/Const.java deleted file mode 100644 index 4b189c11..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/Const.java +++ /dev/null @@ -1,10 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.common; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -public class Const { - public final static String ALL_NOT_HAVE = "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"; - public final static String ALL_HAVE = "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"; - public final static String NULL_QUEST = "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"; -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/Const.kt b/src/main/java/icu/samnyan/aqua/sega/diva/model/common/Const.kt new file mode 100644 index 00000000..4f74e70b --- /dev/null +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/common/Const.kt @@ -0,0 +1,9 @@ +package icu.samnyan.aqua.sega.diva.model.common + +object Const { + const val ALL_NOT_HAVE: String = + "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" + const val ALL_HAVE: String = + "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" + const val NULL_QUEST: String = "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" +} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/ContestBorder.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/common/ContestBorder.java deleted file mode 100644 index d58ec3ba..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/ContestBorder.java +++ /dev/null @@ -1,25 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.common; - -import com.fasterxml.jackson.annotation.JsonValue; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -public enum ContestBorder { - NONE(-1), - BRONZE(0), - SILVER(1), - GOLD(2); - - - private final int value; - - ContestBorder(int i) { - this.value = i; - } - - @JsonValue - public int getValue() { - return value; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/ContestLeague.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/common/ContestLeague.java deleted file mode 100644 index 4944f162..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/ContestLeague.java +++ /dev/null @@ -1,25 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.common; - -import com.fasterxml.jackson.annotation.JsonValue; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -public enum ContestLeague { - BEGINNER(0), - INTERMEDIATE(1), - ADVANCED(2), - PROFESSIONAL(3); - - - private final int value; - - ContestLeague(int i) { - this.value = i; - } - - @JsonValue - public int getValue() { - return value; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/ContestNormaType.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/common/ContestNormaType.java deleted file mode 100644 index 1147bc38..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/ContestNormaType.java +++ /dev/null @@ -1,24 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.common; - -import com.fasterxml.jackson.annotation.JsonValue; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -public enum ContestNormaType { - SCORE(0), - PERCENTAGE(1), - COOL_PERCENTAGE(2); - - - private final int value; - - ContestNormaType(int i) { - this.value = i; - } - - @JsonValue - public int getValue() { - return value; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/ContestProgress.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/common/ContestProgress.java deleted file mode 100644 index c68d231b..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/ContestProgress.java +++ /dev/null @@ -1,20 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.common; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.Setter; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -@AllArgsConstructor -public class ContestProgress { - int pvId; - int hardness; - int edition; - int stars; - int scores; - int version; -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/ContestProgress.kt b/src/main/java/icu/samnyan/aqua/sega/diva/model/common/ContestProgress.kt new file mode 100644 index 00000000..ac82a27c --- /dev/null +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/common/ContestProgress.kt @@ -0,0 +1,10 @@ +package icu.samnyan.aqua.sega.diva.model.common + +class ContestProgress( + var pvId: Int = 0, + var hardness: Int = 0, + var edition: Int = 0, + var stars: Int = 0, + var scores: Int = 0, + var version: Int = 0 +) \ No newline at end of file diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/ContestStageLimit.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/common/ContestStageLimit.java deleted file mode 100644 index ac3272f6..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/ContestStageLimit.java +++ /dev/null @@ -1,23 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.common; - -import com.fasterxml.jackson.annotation.JsonValue; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -public enum ContestStageLimit { - UNLIMITED(0), - LIMITED(1); - - - private final int value; - - ContestStageLimit(int i) { - this.value = i; - } - - @JsonValue - public int getValue() { - return value; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/Difficulty.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/common/Difficulty.java deleted file mode 100644 index dd09faad..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/Difficulty.java +++ /dev/null @@ -1,34 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.common; - -import com.fasterxml.jackson.annotation.JsonValue; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -public enum Difficulty { - UNDEFINED(-1), - EASY(0), - NORMAL(1), - HARD(2), - EXTREME(3); - - - private final int value; - - Difficulty(int i) { - this.value = i; - } - - public static Difficulty fromValue(int i) { - for (Difficulty difficulty : - Difficulty.values()) { - if (difficulty.getValue() == i) return difficulty; - } - return Difficulty.UNDEFINED; - } - - @JsonValue - public int getValue() { - return value; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/Edition.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/common/Edition.java deleted file mode 100644 index de0b0823..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/Edition.java +++ /dev/null @@ -1,31 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.common; - -import com.fasterxml.jackson.annotation.JsonValue; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -public enum Edition { - ORIGINAL(0), - EXTRA(1); - - - private final int value; - - Edition(int i) { - this.value = i; - } - - public static Edition fromValue(int i) { - for (Edition edition : - Edition.values()) { - if (edition.getValue() == i) return edition; - } - return Edition.ORIGINAL; - } - - @JsonValue - public int getValue() { - return value; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/FestaKind.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/common/FestaKind.java deleted file mode 100644 index be588abf..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/FestaKind.java +++ /dev/null @@ -1,23 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.common; - -import com.fasterxml.jackson.annotation.JsonValue; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -public enum FestaKind { - PINK_FESTA(0), - GREEN_FESTA(1); - - - private final int value; - - FestaKind(int i) { - this.value = i; - } - - @JsonValue - public int getValue() { - return value; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/LevelInfo.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/common/LevelInfo.java deleted file mode 100644 index 7e7222f7..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/LevelInfo.java +++ /dev/null @@ -1,16 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.common; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -public class LevelInfo { - private int levelNumber; - private int levelExp; -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/LevelInfo.kt b/src/main/java/icu/samnyan/aqua/sega/diva/model/common/LevelInfo.kt new file mode 100644 index 00000000..5d1be423 --- /dev/null +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/common/LevelInfo.kt @@ -0,0 +1,6 @@ +package icu.samnyan.aqua.sega.diva.model.common + +class LevelInfo( + var levelNumber: Int = 0, + var levelExp: Int = 0, +) diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/PassStat.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/common/PassStat.java deleted file mode 100644 index 9ac39e97..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/PassStat.java +++ /dev/null @@ -1,25 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.common; - -import com.fasterxml.jackson.annotation.JsonValue; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -public enum PassStat { - MISS(0), - SET(1), - RESET(2), - REISSUE(3); - - - private final int value; - - PassStat(int i) { - this.value = i; - } - - @JsonValue - public int getValue() { - return value; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/PreStartResult.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/common/PreStartResult.java deleted file mode 100644 index e398b5a2..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/PreStartResult.java +++ /dev/null @@ -1,27 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.common; - -import com.fasterxml.jackson.annotation.JsonValue; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -public enum PreStartResult { - SUCCESS(1), - FAILED(0), - CARD_TOO_NEW(-1), - ALREADY_PLAYING(-2), - NEW_REGISTRATION(-3), - CARD_BANNED(-4); - - - private final int value; - - PreStartResult(int i) { - this.value = i; - } - - @JsonValue - public int getValue() { - return value; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/Result.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/common/Result.java deleted file mode 100644 index 4c6d1ed3..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/Result.java +++ /dev/null @@ -1,23 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.common; - -import com.fasterxml.jackson.annotation.JsonValue; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -public enum Result { - FAILED(0), - SUCCESS(1); - - - private final int value; - - Result(int i) { - this.value = i; - } - - @JsonValue - public int getValue() { - return value; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/SortMode.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/common/SortMode.java deleted file mode 100644 index bc308662..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/SortMode.java +++ /dev/null @@ -1,35 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.common; - -import com.fasterxml.jackson.annotation.JsonValue; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -public enum SortMode { - COMPLEXITY(0), - NAME(1), - RELEASE_DATE(2), - MY_LIST_A(3), - MY_LIST_B(4), - MY_LIST_C(5); - - - private final int value; - - SortMode(int i) { - this.value = i; - } - - public static SortMode fromValue(int i) { - for (SortMode sortMode : - SortMode.values()) { - if (sortMode.getValue() == i) return sortMode; - } - return SortMode.RELEASE_DATE; - } - - @JsonValue - public int getValue() { - return value; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/SortMode.kt b/src/main/java/icu/samnyan/aqua/sega/diva/model/common/SortMode.kt new file mode 100644 index 00000000..e2330e11 --- /dev/null +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/common/SortMode.kt @@ -0,0 +1,146 @@ +package icu.samnyan.aqua.sega.diva.model.common + +import com.fasterxml.jackson.annotation.JsonValue + +enum class SortMode(@get:JsonValue val value: Int) { + COMPLEXITY(0), + NAME(1), + RELEASE_DATE(2), + MY_LIST_A(3), + MY_LIST_B(4), + MY_LIST_C(5); + + companion object { + fun fromValue(i: Int): SortMode { + for (sortMode in entries) { + if (sortMode.value == i) return sortMode + } + return RELEASE_DATE + } + } +} + +enum class StartMode { + PRE_START, + START, + CARD_PROCEDURE +} + +enum class Result(@get:JsonValue val value: Int) { + FAILED(0), + SUCCESS(1) +} + +enum class PreStartResult(@get:JsonValue val value: Int) { + SUCCESS(1), + FAILED(0), + CARD_TOO_NEW(-1), + ALREADY_PLAYING(-2), + NEW_REGISTRATION(-3), + CARD_BANNED(-4) +} + +enum class PassStat(@get:JsonValue val value: Int) { + MISS(0), + SET(1), + RESET(2), + REISSUE(3) +} + +enum class FestaKind(@get:JsonValue val value: Int) { + PINK_FESTA(0), + GREEN_FESTA(1) +} + +enum class Edition(@get:JsonValue val value: Int) { + ORIGINAL(0), + EXTRA(1); + + companion object { + fun fromValue(i: Int): Edition { + for (edition in entries) { + if (edition.value == i) return edition + } + return ORIGINAL + } + } +} + +enum class Difficulty(@get:JsonValue val value: Int) { + UNDEFINED(-1), + EASY(0), + NORMAL(1), + HARD(2), + EXTREME(3); + + companion object { + fun fromValue(i: Int): Difficulty { + for (difficulty in entries) { + if (difficulty.value == i) return difficulty + } + return UNDEFINED + } + } +} + +enum class ContestStageLimit(@get:JsonValue val value: Int) { + UNLIMITED(0), + LIMITED(1) +} + +enum class ContestNormaType(@get:JsonValue val value: Int) { + SCORE(0), + PERCENTAGE(1), + COOL_PERCENTAGE(2) +} + +enum class ContestLeague(@get:JsonValue val value: Int) { + BEGINNER(0), + INTERMEDIATE(1), + ADVANCED(2), + PROFESSIONAL(3) +} + +enum class ContestBorder(@get:JsonValue val value: Int) { + NONE(-1), + BRONZE(0), + SILVER(1), + GOLD(2) +} + +enum class ClearResult(@get:JsonValue val value: Int) { + NO_CLEAR(-1), + MISS_TAKE(0), + CHEAP(1), + STANDARD(2), + GREAT(3), + EXCELLENT(4), + PERFECT(5); + + companion object { + fun fromValue(i: Int): ClearResult { + for (clearResult in entries) { + if (clearResult.value == i) return clearResult + } + return NO_CLEAR + } + } +} + +enum class ChallengeKind(@get:JsonValue val value: Int) { + UNDEFINED(-1), + CLEAR(0), + GREAT(1), + EXCELLENT(2), + PERFECT(3), + COMPLETED(4); + + companion object { + fun fromValue(i: Int): ChallengeKind { + for (challengeKind in entries) { + if (challengeKind.value == i) return challengeKind + } + return UNDEFINED + } + } +} \ No newline at end of file diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/StartMode.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/common/StartMode.java deleted file mode 100644 index 83b13a1a..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/StartMode.java +++ /dev/null @@ -1,10 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.common; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -public enum StartMode { - PRE_START, - START, - CARD_PROCEDURE -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/ValueEnum.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/common/ValueEnum.java deleted file mode 100644 index 17c33077..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/ValueEnum.java +++ /dev/null @@ -1,8 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.common; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -public interface ValueEnum { - int getValue(); -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/collection/ClearSet.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/common/collection/ClearSet.java deleted file mode 100644 index b49a7c0b..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/collection/ClearSet.java +++ /dev/null @@ -1,38 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.common.collection; - -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Data -@NoArgsConstructor -public class ClearSet { - private int clear = 0; - private int great = 0; - private int excellent = 0; - private int perfect = 0; - - public void addClear() { - this.clear += 1; - } - - public void addGreat() { - this.clear += 1; - this.great += 1; - } - - public void addExcellent() { - this.clear += 1; - this.great += 1; - this.excellent += 1; - } - - public void addPerfect() { - this.clear += 1; - this.great += 1; - this.excellent += 1; - this.perfect += 1; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/collection/ClearTally.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/common/collection/ClearTally.java deleted file mode 100644 index bea57e2d..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/collection/ClearTally.java +++ /dev/null @@ -1,49 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.common.collection; - -import icu.samnyan.aqua.sega.diva.model.Internalizable; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.LinkedList; -import java.util.List; -import java.util.stream.Collectors; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Data -@NoArgsConstructor -public class ClearTally implements Internalizable { - - private ClearSet easy = new ClearSet(); - private ClearSet normal = new ClearSet(); - private ClearSet hard = new ClearSet(); - private ClearSet extreme = new ClearSet(); - private ClearSet extraExtreme = new ClearSet(); - - @Override - public String toInternal() { - List list = new LinkedList<>(); - list.add(easy.getClear()); - list.add(easy.getGreat()); - list.add(easy.getExcellent()); - list.add(easy.getPerfect()); - list.add(normal.getClear()); - list.add(normal.getGreat()); - list.add(normal.getExcellent()); - list.add(normal.getPerfect()); - list.add(hard.getClear()); - list.add(hard.getGreat()); - list.add(hard.getExcellent()); - list.add(hard.getPerfect()); - list.add(extreme.getClear()); - list.add(extreme.getGreat()); - list.add(extreme.getExcellent()); - list.add(extreme.getPerfect()); - list.add(extraExtreme.getClear()); - list.add(extraExtreme.getGreat()); - list.add(extraExtreme.getExcellent()); - list.add(extraExtreme.getPerfect()); - return list.stream().map(Object::toString).collect(Collectors.joining(",")); - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/collection/ClearTally.kt b/src/main/java/icu/samnyan/aqua/sega/diva/model/common/collection/ClearTally.kt new file mode 100644 index 00000000..ce6d3c73 --- /dev/null +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/common/collection/ClearTally.kt @@ -0,0 +1,49 @@ +package icu.samnyan.aqua.sega.diva.model.common.collection + +import ext.csv +import icu.samnyan.aqua.sega.diva.model.Internalizable + +class ClearSet { + var clear = 0 + var great = 0 + var excellent = 0 + var perfect = 0 + + fun addClear() { + this.clear += 1 + } + + fun addGreat() { + this.clear += 1 + this.great += 1 + } + + fun addExcellent() { + this.clear += 1 + this.great += 1 + this.excellent += 1 + } + + fun addPerfect() { + this.clear += 1 + this.great += 1 + this.excellent += 1 + this.perfect += 1 + } +} + +class ClearTally : Internalizable { + val easy = ClearSet() + val normal = ClearSet() + val hard = ClearSet() + val extreme = ClearSet() + val extraExtreme = ClearSet() + + override fun toInternal() = listOf( + easy.clear, easy.great, easy.excellent, easy.perfect, + normal.clear, normal.great, normal.excellent, normal.perfect, + hard.clear, hard.great, hard.excellent, hard.perfect, + extreme.clear, extreme.great, extreme.excellent, extreme.perfect, + extraExtreme.clear, extraExtreme.great, extraExtreme.excellent, extraExtreme.perfect + ).csv +} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/collection/FestaCollection.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/common/collection/FestaCollection.java deleted file mode 100644 index 50887124..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/collection/FestaCollection.java +++ /dev/null @@ -1,79 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.common.collection; - -import icu.samnyan.aqua.sega.diva.model.db.gamedata.Festa; -import icu.samnyan.aqua.sega.diva.util.DivaTime; -import icu.samnyan.aqua.sega.diva.util.URIEncoder; -import lombok.Data; - -import java.util.List; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Data -public class FestaCollection { - private Festa firstFesta = new Festa(); - private Festa secondFesta = new Festa(); - - public FestaCollection(Festa firstFesta, Festa secondFesta) { - this.firstFesta = firstFesta; - this.secondFesta = secondFesta; - } - - public FestaCollection(Festa firstFesta) { - this.firstFesta = firstFesta; - } - - public FestaCollection(List festas) { - if (festas.size() >= 2) { - this.firstFesta = festas.get(0); - this.secondFesta = festas.get(1); - } else if (festas.size() == 1) { - this.firstFesta = festas.get(0); - } - } - - public String getIds() { - return this.firstFesta.getId() + "," + this.secondFesta.getId(); - } - - public String getNames() { - return URIEncoder.encode(this.firstFesta.getName()) + "," + URIEncoder.encode(this.secondFesta.getName()); - } - - public String getKinds() { - return this.firstFesta.getKind().getValue() + "," + this.secondFesta.getKind().getValue(); - } - - public String getDiffs() { - return this.firstFesta.getDifficulty().getValue() + "," + this.secondFesta.getDifficulty().getValue(); - } - - public String getPvIds() { - return this.firstFesta.getPvList() + "," + this.secondFesta.getPvList(); - } - - public String getAttr() { - return this.firstFesta.getAttributes() + "," + this.secondFesta.getAttributes(); - } - - public String getAddVps() { - return this.firstFesta.getAddVP() + "," + this.secondFesta.getAddVP(); - } - - public String getVpMultipliers() { - return this.firstFesta.getVpMultiplier() + "," + this.secondFesta.getVpMultiplier(); - } - - public String getStarts() { - return DivaTime.getString(this.firstFesta.getStart()) + "," + DivaTime.getString(this.secondFesta.getStart()); - } - - public String getEnds() { - return DivaTime.getString(this.firstFesta.getEnd()) + "," + DivaTime.getString(this.secondFesta.getEnd()); - } - - public String getLastUpdateTime() { - return DivaTime.getString(this.firstFesta.getCreateDate().isBefore(this.secondFesta.getCreateDate()) ? this.firstFesta.getCreateDate() : this.secondFesta.getCreateDate()); - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/collection/FestaCollection.kt b/src/main/java/icu/samnyan/aqua/sega/diva/model/common/collection/FestaCollection.kt new file mode 100644 index 00000000..41eaf208 --- /dev/null +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/common/collection/FestaCollection.kt @@ -0,0 +1,53 @@ +package icu.samnyan.aqua.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 lombok.Data + +class FestaCollection { + var firstFesta = Festa() + var secondFesta = Festa() + + constructor(festas: MutableList) { + if (festas.size >= 2) { + this.firstFesta = festas.get(0) + this.secondFesta = festas.get(1) + } else if (festas.size == 1) { + this.firstFesta = festas.get(0) + } + } + + val ids: String + get() = this.firstFesta.id.toString() + "," + this.secondFesta.id + + val names: String + get() = encode(this.firstFesta.name) + "," + encode(this.secondFesta.name) + + val kinds: String + get() = this.firstFesta.kind.value.toString() + "," + this.secondFesta.kind.value + + val diffs: String + get() = this.firstFesta.difficulty.value.toString() + "," + this.secondFesta.difficulty.value + + val pvIds: String + get() = this.firstFesta.pvList + "," + this.secondFesta.pvList + + val attr: String + get() = this.firstFesta.attributes + "," + this.secondFesta.attributes + + val addVps: String + get() = this.firstFesta.addVP.toString() + "," + this.secondFesta.addVP + + val vpMultipliers: String + get() = this.firstFesta.vpMultiplier.toString() + "," + this.secondFesta.vpMultiplier + + val starts: String + get() = getString(this.firstFesta.start) + "," + getString(this.secondFesta.start) + + val ends: String + get() = getString(this.firstFesta.end) + "," + getString(this.secondFesta.end) + + val lastUpdateTime: String + get() = getString(if (this.firstFesta.createDate.isBefore(this.secondFesta.createDate)) this.firstFesta.createDate else this.secondFesta.createDate) +} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/collection/PsRankingCollection.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/common/collection/PsRankingCollection.java deleted file mode 100644 index e03fd7ec..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/collection/PsRankingCollection.java +++ /dev/null @@ -1,32 +0,0 @@ -package icu.samnyan.aqua.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 lombok.Data; - -import java.util.List; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Data -public class PsRankingCollection { - private PlayerPvRecord first; - private PlayerPvRecord second; - private PlayerPvRecord third; - - public PsRankingCollection(int pvId, Edition edition, List list) { - this.first = new PlayerPvRecord(pvId, edition); - this.second = new PlayerPvRecord(pvId, edition); - this.third = new PlayerPvRecord(pvId, edition); - if (list.size() >= 1) { - this.first = list.get(0); - } - if (list.size() >= 2) { - this.second = list.get(1); - } - if (list.size() >= 3) { - this.third = list.get(2); - } - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/collection/PsRankingCollection.kt b/src/main/java/icu/samnyan/aqua/sega/diva/model/common/collection/PsRankingCollection.kt new file mode 100644 index 00000000..9a539ed4 --- /dev/null +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/common/collection/PsRankingCollection.kt @@ -0,0 +1,26 @@ +package icu.samnyan.aqua.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 lombok.Data + +class PsRankingCollection(pvId: Int, edition: Edition, list: MutableList) { + var first: PlayerPvRecord + var second: PlayerPvRecord + var third: PlayerPvRecord + + init { + this.first = PlayerPvRecord(pvId, edition) + this.second = PlayerPvRecord(pvId, edition) + this.third = PlayerPvRecord(pvId, edition) + if (list.size >= 1) { + this.first = list[0] + } + if (list.size >= 2) { + this.second = list.get(1) + } + if (list.size >= 3) { + this.third = list.get(2) + } + } +} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/card/CardProcedureResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/card/CardProcedureResponse.java deleted file mode 100644 index 787922bd..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/card/CardProcedureResponse.java +++ /dev/null @@ -1,45 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.response.card; - -import icu.samnyan.aqua.sega.diva.model.common.PassStat; -import icu.samnyan.aqua.sega.diva.model.common.Result; -import lombok.Getter; -import lombok.Setter; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -public class CardProcedureResponse { - private Result cd_adm_result; - private int chg_name_price = 100; - private int accept_idx; - private long pd_id; - private String player_name; - private Integer lv_num; - private Integer lv_pnt; - private String lv_str; - private Integer lv_efct_id; - private Integer lv_plt_id; - private Integer vcld_pts; - private PassStat passwd_stat; - - public CardProcedureResponse(Result cd_adm_result, int chg_name_price, int accept_idx, long pd_id, String player_name, Integer lv_num, Integer lv_pnt, String lv_str, Integer lv_efct_id, Integer lv_plt_id, Integer vcld_pts, PassStat passwd_stat) { - this.cd_adm_result = cd_adm_result; - this.chg_name_price = chg_name_price; - this.accept_idx = accept_idx; - this.pd_id = pd_id; - this.player_name = player_name; - this.lv_num = lv_num; - this.lv_pnt = lv_pnt; - this.lv_str = lv_str; - this.lv_efct_id = lv_efct_id; - this.lv_plt_id = lv_plt_id; - this.vcld_pts = vcld_pts; - this.passwd_stat = passwd_stat; - } - - public CardProcedureResponse(Result cd_adm_result) { - this.cd_adm_result = cd_adm_result; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/card/ChangeNameResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/card/ChangeNameResponse.java deleted file mode 100644 index c7511072..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/card/ChangeNameResponse.java +++ /dev/null @@ -1,28 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.response.card; - -import icu.samnyan.aqua.sega.diva.model.common.Result; -import lombok.Getter; -import lombok.Setter; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -public class ChangeNameResponse { - private Result cd_adm_result; - private int accept_idx; - private long pd_id; - private String player_name; - - public ChangeNameResponse(Result cd_adm_result, int accept_idx, long pd_id, String player_name) { - this.cd_adm_result = cd_adm_result; - this.accept_idx = accept_idx; - this.pd_id = pd_id; - this.player_name = player_name; - } - - public ChangeNameResponse(Result cd_adm_result) { - this.cd_adm_result = cd_adm_result; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/card/ChangePasswdResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/card/ChangePasswdResponse.java deleted file mode 100644 index e0e2abf2..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/card/ChangePasswdResponse.java +++ /dev/null @@ -1,26 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.response.card; - -import icu.samnyan.aqua.sega.diva.model.common.Result; -import lombok.Getter; -import lombok.Setter; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -public class ChangePasswdResponse { - private Result cd_adm_result; - private int accept_idx; - private long pd_id; - - public ChangePasswdResponse(Result cd_adm_result, int accept_idx, long pd_id) { - this.cd_adm_result = cd_adm_result; - this.accept_idx = accept_idx; - this.pd_id = pd_id; - } - - public ChangePasswdResponse(Result cd_adm_result) { - this.cd_adm_result = cd_adm_result; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/card/RegistrationResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/card/RegistrationResponse.java deleted file mode 100644 index 954583a1..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/card/RegistrationResponse.java +++ /dev/null @@ -1,20 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.response.card; - -import icu.samnyan.aqua.sega.diva.model.common.Result; -import lombok.Getter; -import lombok.Setter; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -public class RegistrationResponse { - private Result cd_adm_result; - private long pd_id; - - public RegistrationResponse(Result cd_adm_result, long pd_id) { - this.cd_adm_result = cd_adm_result; - this.pd_id = pd_id; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/ContestInfoResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/ContestInfoResponse.java deleted file mode 100644 index 04676e72..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/ContestInfoResponse.java +++ /dev/null @@ -1,21 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.response.databank; - -import lombok.Getter; -import lombok.Setter; - -import java.time.LocalDateTime; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -public class ContestInfoResponse { - private LocalDateTime ci_lut; - private String ci_str; - - public ContestInfoResponse(LocalDateTime ci_lut, String ci_str) { - this.ci_lut = ci_lut; - this.ci_str = ci_str; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/FestaInfoResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/FestaInfoResponse.java deleted file mode 100644 index 7e9fed61..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/FestaInfoResponse.java +++ /dev/null @@ -1,37 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.response.databank; - -import lombok.Getter; -import lombok.Setter; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -public class FestaInfoResponse { - private String fi_id; - private String fi_name; - private String fi_kind; - private String fi_difficulty; - private String fi_pv_id_lst; - private String fi_attr; - private String fi_add_vp; - private String fi_mul_vp; - private String fi_st; - private String fi_et; - private String fi_lut; - - public FestaInfoResponse(String fi_id, String fi_name, String fi_kind, String fi_difficulty, String fi_pv_id_lst, String fi_attr, String fi_add_vp, String fi_mul_vp, String fi_st, String fi_et, String fi_lut) { - this.fi_id = fi_id; - this.fi_name = fi_name; - this.fi_kind = fi_kind; - this.fi_difficulty = fi_difficulty; - this.fi_pv_id_lst = fi_pv_id_lst; - this.fi_attr = fi_attr; - this.fi_add_vp = fi_add_vp; - this.fi_mul_vp = fi_mul_vp; - this.fi_st = fi_st; - this.fi_et = fi_et; - this.fi_lut = fi_lut; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/NvRankingResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/NvRankingResponse.java deleted file mode 100644 index 0ead05c8..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/NvRankingResponse.java +++ /dev/null @@ -1,25 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.response.databank; - -import lombok.Getter; -import lombok.Setter; - -import java.time.LocalDateTime; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -public class NvRankingResponse { - private String rnk_nv_tag_str; - private LocalDateTime rnk_nv_ts; - private String rnk_nv_data; - private LocalDateTime rnk_nv_lut; - - public NvRankingResponse(String rnk_nv_tag_str, LocalDateTime rnk_nv_ts, String rnk_nv_data, LocalDateTime rnk_nv_lut) { - this.rnk_nv_tag_str = rnk_nv_tag_str; - this.rnk_nv_ts = rnk_nv_ts; - this.rnk_nv_data = rnk_nv_data; - this.rnk_nv_lut = rnk_nv_lut; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/PsRankingResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/PsRankingResponse.java deleted file mode 100644 index 4b3e5172..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/PsRankingResponse.java +++ /dev/null @@ -1,43 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.response.databank; - -import lombok.Getter; -import lombok.Setter; - -import java.time.LocalDateTime; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -public class PsRankingResponse { - private LocalDateTime rnk_ps_lut; - private LocalDateTime rnk_ps_ts; - private int rnk_ps_dffclty; - private String rnk_ps_pv_id; - private String rnk_ps_edtn1; - private String rnk_ps_edtn2; - private String rnk_ps_edtn3; - private String rnk_ps_scr1; - private String rnk_ps_scr2; - private String rnk_ps_scr3; - private String rnk_ps_nm1; - private String rnk_ps_nm2; - private String rnk_ps_nm3; - - public PsRankingResponse(LocalDateTime rnk_ps_lut, LocalDateTime rnk_ps_ts, int rnk_ps_dffclty, String rnk_ps_pv_id, String rnk_ps_edtn1, String rnk_ps_edtn2, String rnk_ps_edtn3, String rnk_ps_scr1, String rnk_ps_scr2, String rnk_ps_scr3, String rnk_ps_nm1, String rnk_ps_nm2, String rnk_ps_nm3) { - this.rnk_ps_lut = rnk_ps_lut; - this.rnk_ps_ts = rnk_ps_ts; - this.rnk_ps_dffclty = rnk_ps_dffclty; - this.rnk_ps_pv_id = rnk_ps_pv_id; - this.rnk_ps_edtn1 = rnk_ps_edtn1; - this.rnk_ps_edtn2 = rnk_ps_edtn2; - this.rnk_ps_edtn3 = rnk_ps_edtn3; - this.rnk_ps_scr1 = rnk_ps_scr1; - this.rnk_ps_scr2 = rnk_ps_scr2; - this.rnk_ps_scr3 = rnk_ps_scr3; - this.rnk_ps_nm1 = rnk_ps_nm1; - this.rnk_ps_nm2 = rnk_ps_nm2; - this.rnk_ps_nm3 = rnk_ps_nm3; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/PvListResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/PvListResponse.java deleted file mode 100644 index 1e3746e8..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/PvListResponse.java +++ /dev/null @@ -1,21 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.response.databank; - -import lombok.Getter; -import lombok.Setter; - -import java.time.LocalDateTime; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -public class PvListResponse { - private LocalDateTime pvl_lut; - private String pv_lst; - - public PvListResponse(LocalDateTime pvl_lut, String pv_lst) { - this.pvl_lut = pvl_lut; - this.pv_lst = pv_lst; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/ShopCatalogResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/ShopCatalogResponse.java deleted file mode 100644 index a6ecfbeb..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/ShopCatalogResponse.java +++ /dev/null @@ -1,21 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.response.databank; - -import lombok.Getter; -import lombok.Setter; - -import java.time.LocalDateTime; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -public class ShopCatalogResponse { - private LocalDateTime shp_ctlg_lut; - private String shp_ctlg; - - public ShopCatalogResponse(LocalDateTime shp_ctlg_lut, String shp_ctlg) { - this.shp_ctlg_lut = shp_ctlg_lut; - this.shp_ctlg = shp_ctlg; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/ingame/BuyCstmzItmResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/ingame/BuyCstmzItmResponse.java deleted file mode 100644 index 118e08d1..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/ingame/BuyCstmzItmResponse.java +++ /dev/null @@ -1,28 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.response.ingame; - -import icu.samnyan.aqua.sega.diva.model.common.Result; -import lombok.Getter; -import lombok.Setter; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -public class BuyCstmzItmResponse { - private Result shp_rslt; - private int cstmz_itm_id; - private String cstmz_itm_have; - private int vcld_pts; - - public BuyCstmzItmResponse(Result shp_rslt, int cstmz_itm_id, String cstmz_itm_have, int vcld_pts) { - this.shp_rslt = shp_rslt; - this.cstmz_itm_id = cstmz_itm_id; - this.cstmz_itm_have = cstmz_itm_have; - this.vcld_pts = vcld_pts; - } - - public BuyCstmzItmResponse(Result shp_rslt) { - this.shp_rslt = shp_rslt; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/ingame/BuyModuleResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/ingame/BuyModuleResponse.java deleted file mode 100644 index 29546305..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/ingame/BuyModuleResponse.java +++ /dev/null @@ -1,28 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.response.ingame; - -import icu.samnyan.aqua.sega.diva.model.common.Result; -import lombok.Getter; -import lombok.Setter; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -public class BuyModuleResponse { - private Result shp_rslt; - private int mdl_id; - private String mdl_have; - private int vcld_pts; - - public BuyModuleResponse(Result shp_rslt, int mdl_id, String mdl_have, int vcld_pts) { - this.shp_rslt = shp_rslt; - this.mdl_id = mdl_id; - this.mdl_have = mdl_have; - this.vcld_pts = vcld_pts; - } - - public BuyModuleResponse(Result shp_rslt) { - this.shp_rslt = shp_rslt; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/ingame/GetPvPdResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/ingame/GetPvPdResponse.java deleted file mode 100644 index 0f2d7134..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/ingame/GetPvPdResponse.java +++ /dev/null @@ -1,21 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.response.ingame; - -import lombok.Getter; -import lombok.Setter; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -public class GetPvPdResponse { - private String pd_by_pv_id; - private Boolean pdddt_flg; - private String pdddt_tm; - - public GetPvPdResponse(String pd_by_pv_id, Boolean pdddt_flg, String pdddt_tm) { - this.pd_by_pv_id = pd_by_pv_id; - this.pdddt_flg = pdddt_flg; - this.pdddt_tm = pdddt_tm; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/ingame/ShopExitResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/ingame/ShopExitResponse.java deleted file mode 100644 index 75116650..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/ingame/ShopExitResponse.java +++ /dev/null @@ -1,18 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.response.ingame; - -import icu.samnyan.aqua.sega.diva.model.common.Result; -import lombok.Getter; -import lombok.Setter; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -public class ShopExitResponse { - private Result shp_rslt; - - public ShopExitResponse(Result shp_rslt) { - this.shp_rslt = shp_rslt; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/ingame/StageResultResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/ingame/StageResultResponse.java deleted file mode 100644 index d37ccae5..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/ingame/StageResultResponse.java +++ /dev/null @@ -1,108 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.response.ingame; - -import lombok.Getter; -import lombok.Setter; - -import java.time.LocalDateTime; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -public class StageResultResponse { - - private int chllng_kind; - private int lv_num_old; - private int lv_pnt_old; - private int lv_num; - private int lv_pnt; - private String lv_str; - private int lv_efct_id; - private int lv_plt_id; - private int vcld_pts; - private int prsnt_vcld_pts; - private int cnp_cid; - private int cnp_val; - private String cnp_sp; - private String crwd_kind = "-1,-1,-1"; - private String crwd_value = "-1,-1,-1"; - private String crwd_str_0 = "***,***,***"; - private String crwd_str_1 = "***,***,***"; - private int cerwd_kind = -1; - private int cerwd_value = -1; - private String cerwd_str_0 = "***"; - private String cerwd_str_1 = "***"; - private String ttl_str_ary = "xxx"; - private String ttl_plt_id_ary = "-1,-1,-1,-1,-1"; - private String ttl_desc_ary = "xxx"; - private String skin_id_ary = "xxx"; - private String skin_name_ary = "xxx"; - private String skin_illust_ary = "xxx"; - private String skin_desc_ary = "xxx"; - private int pdddt_flg = 0; - private LocalDateTime pdddt_tm; - private int nblss_ltt_stts = -1; - private int nblss_ltt_tckt = -1; - private int nblss_ltt_is_opn = 0; - private int nblss_ltt_prz = 0; - private int nblss_ltt_nxt_stts = 0; - private int nblss_ltt_nxt_tckt = -1; - private String my_qst_id; - private String my_qst_r_qid; - private String my_qst_r_knd; - private String my_qst_r_vl; - private String my_qst_r_nflg; - private String my_ccd_r_qid; - private String my_ccd_r_hnd; - private String my_ccd_r_vp; - - public StageResultResponse() {} - - public StageResultResponse(int chllng_kind, int lv_num_old, int lv_pnt_old, int lv_num, int lv_pnt, String lv_str, int lv_efct_id, int lv_plt_id, int vcld_pts, int prsnt_vcld_pts, int cnp_cid, int cnp_val, String cnp_sp, String crwd_kind, String crwd_value, String crwd_str_0, String crwd_str_1, int cerwd_kind, int cerwd_value, String cerwd_str_0, String cerwd_str_1, String ttl_str_ary, String ttl_plt_id_ary, String ttl_desc_ary, String skin_id_ary, String skin_name_ary, String skin_illust_ary, String skin_desc_ary, int pdddt_flg, LocalDateTime pdddt_tm, int nblss_ltt_stts, int nblss_ltt_tckt, int nblss_ltt_is_opn, int nblss_ltt_prz, int nblss_ltt_nxt_stts, int nblss_ltt_nxt_tckt, String my_qst_id, String my_qst_r_qid, String my_qst_r_knd, String my_qst_r_vl, String my_qst_r_nflg, String my_ccd_r_qid, String my_ccd_r_hnd, String my_ccd_r_vp) { - this.chllng_kind = chllng_kind; - this.lv_num_old = lv_num_old; - this.lv_pnt_old = lv_pnt_old; - this.lv_num = lv_num; - this.lv_pnt = lv_pnt; - this.lv_str = lv_str; - this.lv_efct_id = lv_efct_id; - this.lv_plt_id = lv_plt_id; - this.vcld_pts = vcld_pts; - this.prsnt_vcld_pts = prsnt_vcld_pts; - this.cnp_cid = cnp_cid; - this.cnp_val = cnp_val; - this.cnp_sp = cnp_sp; - this.crwd_kind = crwd_kind; - this.crwd_value = crwd_value; - this.crwd_str_0 = crwd_str_0; - this.crwd_str_1 = crwd_str_1; - this.cerwd_kind = cerwd_kind; - this.cerwd_value = cerwd_value; - this.cerwd_str_0 = cerwd_str_0; - this.cerwd_str_1 = cerwd_str_1; - this.ttl_str_ary = ttl_str_ary; - this.ttl_plt_id_ary = ttl_plt_id_ary; - this.ttl_desc_ary = ttl_desc_ary; - this.skin_id_ary = skin_id_ary; - this.skin_name_ary = skin_name_ary; - this.skin_illust_ary = skin_illust_ary; - this.skin_desc_ary = skin_desc_ary; - this.pdddt_flg = pdddt_flg; - this.pdddt_tm = pdddt_tm; - this.nblss_ltt_stts = nblss_ltt_stts; - this.nblss_ltt_tckt = nblss_ltt_tckt; - this.nblss_ltt_is_opn = nblss_ltt_is_opn; - this.nblss_ltt_prz = nblss_ltt_prz; - this.nblss_ltt_nxt_stts = nblss_ltt_nxt_stts; - this.nblss_ltt_nxt_tckt = nblss_ltt_nxt_tckt; - this.my_qst_id = my_qst_id; - this.my_qst_r_qid = my_qst_r_qid; - this.my_qst_r_knd = my_qst_r_knd; - this.my_qst_r_vl = my_qst_r_vl; - this.my_qst_r_nflg = my_qst_r_nflg; - this.my_ccd_r_qid = my_ccd_r_qid; - this.my_ccd_r_hnd = my_ccd_r_hnd; - this.my_ccd_r_vp = my_ccd_r_vp; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/operation/PingResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/operation/PingResponse.java deleted file mode 100644 index e253c3b8..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/operation/PingResponse.java +++ /dev/null @@ -1,58 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.response.operation; - -import icu.samnyan.aqua.sega.diva.util.URIEncoder; -import lombok.Getter; -import lombok.Setter; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -public class PingResponse { - private String ping_b_msg = URIEncoder.encode("Server Running No other news"); - private String ping_m_msg = URIEncoder.encode("Network Service Running"); - private String atnd_lut; - private String fi_lut; - private String ci_lut; - private String qi_lut; - private String pvl_lut; - private String pdcl_lut; - private String pnml_lut; - private String cinml_lut; - private String rwl_lut; - private String bdlol_lut; - private String shp_ctlg_lut; - private String cstmz_itm_ctlg_lut; - private String ngwl_lut; - private String rnk_nv_lut; - private String rnk_ps_lut; - private String bi_lut; - private String cpi_lut; - private String p_std_hc_lut; - private String p_std_i_n_lut; - - private String req_inv_cmd_num; - private String req_inv_cmd_prm1; - private String req_inv_cmd_prm2; - private String req_inv_cmd_prm3; - private String req_inv_cmd_prm4; - - private boolean pow_save_flg = false; - - private Integer nblss_dnt_p = 0; - private Integer nblss_ltt_rl_vp = 0; - private Integer nblss_ex_ltt_flg = 0; - - private String nblss_dnt_st_tm; - private String nblss_dnt_ed_tm; - private String nblss_ltt_st_tm; - private String nblss_ltt_ed_tm; - - - - public PingResponse(String ping_b_msg, String ping_m_msg) { - this.ping_b_msg = ping_b_msg; - this.ping_m_msg = ping_m_msg; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/user/PreStartResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/user/PreStartResponse.java deleted file mode 100644 index 1d5466ba..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/user/PreStartResponse.java +++ /dev/null @@ -1,70 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.response.user; - -import icu.samnyan.aqua.sega.diva.model.common.PassStat; -import icu.samnyan.aqua.sega.diva.model.common.PreStartResult; -import icu.samnyan.aqua.sega.diva.model.common.SortMode; -import lombok.Getter; -import lombok.Setter; - -import java.time.LocalDateTime; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -public class PreStartResponse { - - private PreStartResult ps_result; - private Integer accept_idx; - private Integer nblss_ltt_stts; - private Integer nblss_ltt_tckt; - private Integer nblss_ltt_is_opn; - - private long pd_id; - private String player_name; - private SortMode sort_kind; - private Integer lv_num; - private Integer lv_pnt; - private String lv_str; - private Integer lv_efct_id; - private Integer lv_plt_id; - private String mdl_eqp_ary; - private LocalDateTime mdl_eqp_tm; - private Integer skn_eqp; - private Integer btn_se_eqp; - private Integer sld_se_eqp; - private Integer chn_sld_se_eqp; - private Integer sldr_tch_se_eqp; - private Integer vcld_pts; - private PassStat passwd_stat; - - public PreStartResponse(PreStartResult ps_result) { - this.ps_result = ps_result; - } - - public PreStartResponse(PreStartResult ps_result, Integer accept_idx, long pd_id, String player_name, SortMode sort_kind, Integer lv_num, Integer lv_pnt, String lv_str, Integer lv_efct_id, Integer lv_plt_id, String mdl_eqp_ary, LocalDateTime mdl_eqp_tm, Integer skn_eqp, Integer btn_se_eqp, Integer sld_se_eqp, Integer chn_sld_se_eqp, Integer sldr_tch_se_eqp, Integer vcld_pts, PassStat passwd_stat) { - this.ps_result = ps_result; - this.accept_idx = accept_idx; - this.nblss_ltt_stts = -1; - this.nblss_ltt_tckt = -1; - this.nblss_ltt_is_opn = -1; - this.pd_id = pd_id; - this.player_name = player_name; - this.sort_kind = sort_kind; - this.lv_num = lv_num; - this.lv_pnt = lv_pnt; - this.lv_str = lv_str; - this.lv_efct_id = lv_efct_id; - this.lv_plt_id = lv_plt_id; - this.mdl_eqp_ary = mdl_eqp_ary; - this.mdl_eqp_tm = mdl_eqp_tm; - this.skn_eqp = skn_eqp; - this.btn_se_eqp = btn_se_eqp; - this.sld_se_eqp = sld_se_eqp; - this.chn_sld_se_eqp = chn_sld_se_eqp; - this.sldr_tch_se_eqp = sldr_tch_se_eqp; - this.vcld_pts = vcld_pts; - this.passwd_stat = passwd_stat; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/user/SpendCreditResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/user/SpendCreditResponse.java deleted file mode 100644 index ada13a4e..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/user/SpendCreditResponse.java +++ /dev/null @@ -1,27 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.response.user; - -import lombok.Getter; -import lombok.Setter; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -public class SpendCreditResponse { - private String cmpgn_rslt; - private int cmpgn_rslt_num; - private int vcld_pts; - private String lv_str; - private int lv_efct_id; - private int lv_plt_id; - - public SpendCreditResponse(String cmpgn_rslt, int cmpgn_rslt_num, int vcld_pts, String lv_str, int lv_efct_id, int lv_plt_id) { - this.cmpgn_rslt = cmpgn_rslt; - this.cmpgn_rslt_num = cmpgn_rslt_num; - this.vcld_pts = vcld_pts; - this.lv_str = lv_str; - this.lv_efct_id = lv_efct_id; - this.lv_plt_id = lv_plt_id; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/user/StartResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/user/StartResponse.java deleted file mode 100644 index f4e242ec..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/user/StartResponse.java +++ /dev/null @@ -1,146 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.response.user; - -import icu.samnyan.aqua.sega.diva.model.common.*; -import lombok.Getter; -import lombok.Setter; - -import java.time.LocalDateTime; - -import static icu.samnyan.aqua.sega.diva.model.common.Const.ALL_HAVE; -import static icu.samnyan.aqua.sega.diva.model.common.Const.ALL_NOT_HAVE; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -public class StartResponse { - - private long pd_id; - private Result start_result = Result.SUCCESS; - private int accept_idx; - private int start_idx; - private String player_name; - private int hp_vol = 100; - private boolean btn_se_vol = true; - private int btn_se_vol2 = 100; - private int sldr_se_vol2 = 10; - private SortMode sort_kind = SortMode.RELEASE_DATE; - private int lv_num; - private int lv_pnt; - private String lv_str; - private int lv_efct_id; - private int lv_plt_id; - private String mdl_eqp_ary; - private String c_itm_eqp_ary; - private String ms_itm_flg_ary; - private LocalDateTime mdl_eqp_tm = LocalDateTime.now(); - private String mdl_have = ALL_HAVE; - private String cstmz_itm_have = ALL_HAVE; - private boolean use_pv_mdl_eqp = false; - private boolean use_mdl_pri = false; - private boolean use_pv_skn_eqp = false; - private boolean use_pv_btn_se_eqp = false; - private boolean use_pv_sld_se_eqp = false; - private boolean use_pv_chn_sld_se_eqp = false; - private boolean use_pv_sldr_tch_se_eqp = false; - private int vcld_pts = 300; - private int nxt_pv_id = -1; - private Difficulty nxt_dffclty = Difficulty.NORMAL; - private Edition nxt_edtn = Edition.ORIGINAL; - - // Contest play history, array of 4 - private String cv_cid; - private String cv_sc; - private String cv_rr; - private String cv_bv; - private String cv_bf; - - // Contest now playing id, return -1 if no current playing contest - private int cnp_cid = -1; - private int cnp_val = 0; - private ContestBorder cnp_rr = ContestBorder.NONE; - private String cnp_sp = ""; - - private String my_lst_0; - private String my_lst_1; - private String my_lst_2; - private String my_lst_3; // Unused - private String my_lst_4; // Unused - - private String dsp_clr_brdr; - private boolean dsp_intrm_rnk; - private boolean dsp_clr_sts; - - private String clr_sts; - - private boolean rgo_sts; - - private String my_qst_id; - private String my_qst_sts; - private String my_qst_prgrs; - private String my_qst_et; - - private String p_std_ie_have = ALL_NOT_HAVE; - private String p_std_se_have = ALL_NOT_HAVE; - - public StartResponse(long pd_id, Result start_result, int accept_idx, int start_idx, String player_name, int hp_vol, boolean btn_se_vol, int btn_se_vol2, int sldr_se_vol2, SortMode sort_kind, int lv_num, int lv_pnt, String lv_str, int lv_efct_id, int lv_plt_id, String mdl_eqp_ary, String c_itm_eqp_ary, String ms_itm_flg_ary, LocalDateTime mdl_eqp_tm, String mdl_have, String cstmz_itm_have, boolean use_pv_mdl_eqp, boolean use_mdl_pri, boolean use_pv_skn_eqp, boolean use_pv_btn_se_eqp, boolean use_pv_sld_se_eqp, boolean use_pv_chn_sld_se_eqp, boolean use_pv_sldr_tch_se_eqp, int vcld_pts, int nxt_pv_id, Difficulty nxt_dffclty, Edition nxt_edtn, String cv_cid, String cv_sc, String cv_rr, String cv_bv, String cv_bf, int cnp_cid, int cnp_val, ContestBorder cnp_rr, String cnp_sp, String my_lst_0, String my_lst_1, String my_lst_2, String my_lst_3, String my_lst_4, String dsp_clr_brdr, boolean dsp_intrm_rnk, boolean dsp_clr_sts, String clr_sts, boolean rgo_sts, String my_qst_id, String my_qst_sts, String my_qst_prgrs, String my_qst_et, String p_std_ie_have, String p_std_se_have) { - this.pd_id = pd_id; - this.start_result = start_result; - this.accept_idx = accept_idx; - this.start_idx = start_idx; - this.player_name = player_name; - this.hp_vol = hp_vol; - this.btn_se_vol = btn_se_vol; - this.btn_se_vol2 = btn_se_vol2; - this.sldr_se_vol2 = sldr_se_vol2; - this.sort_kind = sort_kind; - this.lv_num = lv_num; - this.lv_pnt = lv_pnt; - this.lv_str = lv_str; - this.lv_efct_id = lv_efct_id; - this.lv_plt_id = lv_plt_id; - this.mdl_eqp_ary = mdl_eqp_ary; - this.c_itm_eqp_ary = c_itm_eqp_ary; - this.ms_itm_flg_ary = ms_itm_flg_ary; - this.mdl_eqp_tm = mdl_eqp_tm; - this.mdl_have = mdl_have; - this.cstmz_itm_have = cstmz_itm_have; - this.use_pv_mdl_eqp = use_pv_mdl_eqp; - this.use_mdl_pri = use_mdl_pri; - this.use_pv_skn_eqp = use_pv_skn_eqp; - this.use_pv_btn_se_eqp = use_pv_btn_se_eqp; - this.use_pv_sld_se_eqp = use_pv_sld_se_eqp; - this.use_pv_chn_sld_se_eqp = use_pv_chn_sld_se_eqp; - this.use_pv_sldr_tch_se_eqp = use_pv_sldr_tch_se_eqp; - this.vcld_pts = vcld_pts; - this.nxt_pv_id = nxt_pv_id; - this.nxt_dffclty = nxt_dffclty; - this.nxt_edtn = nxt_edtn; - this.cv_cid = cv_cid; - this.cv_sc = cv_sc; - this.cv_rr = cv_rr; - this.cv_bv = cv_bv; - this.cv_bf = cv_bf; - this.cnp_cid = cnp_cid; - this.cnp_val = cnp_val; - this.cnp_rr = cnp_rr; - this.cnp_sp = cnp_sp; - this.my_lst_0 = my_lst_0; - this.my_lst_1 = my_lst_1; - this.my_lst_2 = my_lst_2; - this.my_lst_3 = my_lst_3; - this.my_lst_4 = my_lst_4; - this.dsp_clr_brdr = dsp_clr_brdr; - this.dsp_intrm_rnk = dsp_intrm_rnk; - this.dsp_clr_sts = dsp_clr_sts; - this.clr_sts = clr_sts; - this.rgo_sts = rgo_sts; - this.my_qst_id = my_qst_id; - this.my_qst_sts = my_qst_sts; - this.my_qst_prgrs = my_qst_prgrs; - this.my_qst_et = my_qst_et; - this.p_std_ie_have = p_std_ie_have; - this.p_std_se_have = p_std_se_have; - } -}