From 7e90aec55dbfa1ef8d3e5b5e5e6ffc66aebc891d Mon Sep 17 00:00:00 2001 From: Azalea <22280294+hykilpikonna@users.noreply.github.com> Date: Sat, 25 Oct 2025 08:14:15 +0800 Subject: [PATCH] [O] Auto optimize --- .../diva/handler/card/ChangePasswdHandler.kt | 2 - .../diva/handler/card/RegistrationHandler.kt | 2 +- .../diva/handler/databank/PstdHCtrlHandler.kt | 2 - .../handler/databank/PvDefChrLstHandler.kt | 2 - .../diva/handler/ingame/BuyCstmzItmHandler.kt | 3 - .../diva/handler/ingame/StageResultHandler.kt | 3 - .../aqua/sega/diva/handler/user/EndHandler.kt | 2 - .../sega/diva/handler/user/PdUnlockHandler.kt | 4 +- .../diva/handler/user/SpendCreditHandler.kt | 3 - .../sega/diva/model/common/ChallengeKind.java | 4 +- .../sega/diva/model/common/ClearResult.java | 4 +- .../sega/diva/model/common/ContestBorder.java | 2 +- .../sega/diva/model/common/ContestLeague.java | 2 +- .../diva/model/common/ContestNormaType.java | 2 +- .../diva/model/common/ContestStageLimit.java | 2 +- .../sega/diva/model/common/Difficulty.java | 4 +- .../aqua/sega/diva/model/common/Edition.java | 4 +- .../sega/diva/model/common/FestaKind.java | 2 +- .../aqua/sega/diva/model/common/PassStat.java | 2 +- .../diva/model/common/PreStartResult.java | 2 +- .../aqua/sega/diva/model/common/Result.java | 2 +- .../aqua/sega/diva/model/common/SortMode.java | 4 +- .../common/attend/GameBalanceParameter.java | 114 +++++++++--------- .../common/attend/GameBalanceTrialBidSet.java | 16 +-- .../common/collection/FestaCollection.java | 2 +- .../sega/diva/model/gamedata/Contest.java | 6 +- .../sega/diva/model/gamedata/Difficulty.java | 2 +- .../diva/model/gamedata/DivaCustomize.java | 10 +- .../sega/diva/model/gamedata/DivaModule.java | 10 +- .../aqua/sega/diva/model/gamedata/Pv.java | 5 +- .../samnyan/aqua/sega/diva/util/DivaUtils.kt | 1 + 31 files changed, 103 insertions(+), 122 deletions(-) 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 f7ad48fe..b4ba8232 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 @@ -5,9 +5,7 @@ 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.request.card.ChangePasswdRequest import icu.samnyan.aqua.sega.diva.model.response.card.ChangePasswdResponse -import icu.samnyan.aqua.sega.diva.util.SessionNotFoundException import org.springframework.stereotype.Component -import java.util.function.Supplier /** * @author samnyan (privateamusement@protonmail.com) 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 6873fa3f..acfb4d92 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 @@ -1,9 +1,9 @@ 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.request.card.RegistrationRequest import icu.samnyan.aqua.sega.diva.model.response.card.RegistrationResponse -import icu.samnyan.aqua.sega.diva.PlayerProfileService import org.springframework.stereotype.Component /** diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PstdHCtrlHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PstdHCtrlHandler.kt index acb3b777..420b67ec 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PstdHCtrlHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PstdHCtrlHandler.kt @@ -3,8 +3,6 @@ package icu.samnyan.aqua.sega.diva.handler.databank import icu.samnyan.aqua.sega.diva.model.request.BaseRequest import icu.samnyan.aqua.sega.diva.model.response.databank.PstdHCtrlResponse import icu.samnyan.aqua.sega.diva.util.DivaDateTimeUtil -import org.slf4j.Logger -import org.slf4j.LoggerFactory import org.springframework.stereotype.Component import java.time.LocalDateTime diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PvDefChrLstHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PvDefChrLstHandler.kt index 809f83ba..ee18cce5 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PvDefChrLstHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PvDefChrLstHandler.kt @@ -3,8 +3,6 @@ package icu.samnyan.aqua.sega.diva.handler.databank import icu.samnyan.aqua.sega.diva.model.request.BaseRequest import icu.samnyan.aqua.sega.diva.model.response.databank.PvDefChrLstResponse import icu.samnyan.aqua.sega.diva.util.DivaDateTimeUtil -import org.slf4j.Logger -import org.slf4j.LoggerFactory 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 50a26ddf..06850ed6 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,10 +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.request.ingame.BuyCstmzItmRequest import icu.samnyan.aqua.sega.diva.model.response.ingame.BuyCstmzItmResponse -import icu.samnyan.aqua.sega.diva.util.ProfileNotFoundException -import icu.samnyan.aqua.sega.diva.util.SessionNotFoundException import org.springframework.stereotype.Component -import java.util.function.Supplier /** * @author samnyan (privateamusement@protonmail.com) 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 cc697375..884cc3e1 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 @@ -7,8 +7,6 @@ import icu.samnyan.aqua.sega.diva.model.request.ingame.StageResultRequest import icu.samnyan.aqua.sega.diva.model.response.ingame.StageResultResponse import icu.samnyan.aqua.sega.diva.model.userdata.* import icu.samnyan.aqua.sega.diva.util.DivaCalculator -import icu.samnyan.aqua.sega.diva.util.ProfileNotFoundException -import icu.samnyan.aqua.sega.diva.util.SessionNotFoundException import org.apache.commons.lang3.StringUtils import org.springframework.stereotype.Component import java.lang.String @@ -31,7 +29,6 @@ class StageResultHandler(val db: DivaRepos, val calc: DivaCalculator) { val logger = logger() fun handle(request: StageResultRequest): Any { - val response: StageResultResponse? if (request.getPd_id() != -1L) { val (profile, session) = db.session(request.pd_id) diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/EndHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/EndHandler.kt index 072eb3e2..11b6ea68 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/EndHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/EndHandler.kt @@ -10,8 +10,6 @@ import icu.samnyan.aqua.sega.diva.model.request.ingame.StageResultRequest import icu.samnyan.aqua.sega.diva.model.response.BaseResponse import icu.samnyan.aqua.sega.diva.model.userdata.PlayerContest import icu.samnyan.aqua.sega.diva.util.DivaStringUtils -import icu.samnyan.aqua.sega.diva.util.ProfileNotFoundException -import icu.samnyan.aqua.sega.diva.util.SessionNotFoundException import org.springframework.stereotype.Component import java.lang.String import java.time.LocalDateTime diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/PdUnlockHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/PdUnlockHandler.kt index c2c37975..57ba1cd1 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/PdUnlockHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/PdUnlockHandler.kt @@ -3,14 +3,12 @@ package icu.samnyan.aqua.sega.diva.handler.user import icu.samnyan.aqua.sega.diva.DivaRepos import icu.samnyan.aqua.sega.diva.model.request.user.PdUnlockRequest import icu.samnyan.aqua.sega.diva.model.response.BaseResponse -import icu.samnyan.aqua.sega.diva.util.SessionNotFoundException import org.springframework.stereotype.Component -import java.util.function.Supplier @Component class PdUnlockHandler(val db: DivaRepos) { fun handle(request: PdUnlockRequest): Any { - val (profile, session) = db.session(request.pd_id) + val (_, session) = db.session(request.pd_id) db.gameSession.delete(session) 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 40eeabf5..b932620a 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 @@ -1,12 +1,9 @@ package icu.samnyan.aqua.sega.diva.handler.user import icu.samnyan.aqua.sega.diva.DivaRepos -import icu.samnyan.aqua.sega.diva.util.ProfileNotFoundException import icu.samnyan.aqua.sega.diva.model.request.user.SpendCreditRequest import icu.samnyan.aqua.sega.diva.model.response.user.SpendCreditResponse -import icu.samnyan.aqua.sega.diva.PlayerProfileService import org.springframework.stereotype.Component -import java.util.function.Supplier /** * @author samnyan (privateamusement@protonmail.com) 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 index 6dd6e810..ba488190 100644 --- 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 @@ -14,7 +14,7 @@ public enum ChallengeKind { COMPLETED(4); - private int value; + private final int value; ChallengeKind(int i) { this.value = i; @@ -22,7 +22,7 @@ public enum ChallengeKind { public static ChallengeKind fromValue(int i) { for (ChallengeKind challengeKind : - ChallengeKind.values()) { + ChallengeKind.values()) { if (challengeKind.getValue() == i) return challengeKind; } return ChallengeKind.UNDEFINED; 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 index 9fcea207..1c3eb44b 100644 --- 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 @@ -15,7 +15,7 @@ public enum ClearResult implements ValueEnum { PERFECT(5); - private int value; + private final int value; ClearResult(int i) { this.value = i; @@ -23,7 +23,7 @@ public enum ClearResult implements ValueEnum { public static ClearResult fromValue(int i) { for (ClearResult clearResult : - ClearResult.values()) { + ClearResult.values()) { if (clearResult.getValue() == i) return clearResult; } return ClearResult.NO_CLEAR; 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 index 0ab8303f..d58ec3ba 100644 --- 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 @@ -12,7 +12,7 @@ public enum ContestBorder { GOLD(2); - private int value; + private final int value; ContestBorder(int i) { this.value = i; 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 index c192da6c..4944f162 100644 --- 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 @@ -12,7 +12,7 @@ public enum ContestLeague { PROFESSIONAL(3); - private int value; + private final int value; ContestLeague(int i) { this.value = i; 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 index bccf31ef..1147bc38 100644 --- 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 @@ -11,7 +11,7 @@ public enum ContestNormaType { COOL_PERCENTAGE(2); - private int value; + private final int value; ContestNormaType(int i) { this.value = i; 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 index 578fa8ac..ac3272f6 100644 --- 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 @@ -10,7 +10,7 @@ public enum ContestStageLimit { LIMITED(1); - private int value; + private final int value; ContestStageLimit(int i) { this.value = i; 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 index a444cd25..dd09faad 100644 --- 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 @@ -13,7 +13,7 @@ public enum Difficulty { EXTREME(3); - private int value; + private final int value; Difficulty(int i) { this.value = i; @@ -21,7 +21,7 @@ public enum Difficulty { public static Difficulty fromValue(int i) { for (Difficulty difficulty : - Difficulty.values()) { + Difficulty.values()) { if (difficulty.getValue() == i) return difficulty; } return Difficulty.UNDEFINED; 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 index bb783b21..de0b0823 100644 --- 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 @@ -10,7 +10,7 @@ public enum Edition { EXTRA(1); - private int value; + private final int value; Edition(int i) { this.value = i; @@ -18,7 +18,7 @@ public enum Edition { public static Edition fromValue(int i) { for (Edition edition : - Edition.values()) { + Edition.values()) { if (edition.getValue() == i) return edition; } return Edition.ORIGINAL; 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 index 75c910ce..be588abf 100644 --- 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 @@ -10,7 +10,7 @@ public enum FestaKind { GREEN_FESTA(1); - private int value; + private final int value; FestaKind(int i) { this.value = i; 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 index 41858295..9ac39e97 100644 --- 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 @@ -12,7 +12,7 @@ public enum PassStat { REISSUE(3); - private int value; + private final int value; PassStat(int i) { this.value = i; 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 index 77a210d7..e398b5a2 100644 --- 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 @@ -14,7 +14,7 @@ public enum PreStartResult { CARD_BANNED(-4); - private int value; + private final int value; PreStartResult(int i) { this.value = i; 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 index 77b383b7..4c6d1ed3 100644 --- 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 @@ -10,7 +10,7 @@ public enum Result { SUCCESS(1); - private int value; + private final int value; Result(int i) { this.value = i; 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 index 31ee3103..bc308662 100644 --- 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 @@ -14,7 +14,7 @@ public enum SortMode { MY_LIST_C(5); - private int value; + private final int value; SortMode(int i) { this.value = i; @@ -22,7 +22,7 @@ public enum SortMode { public static SortMode fromValue(int i) { for (SortMode sortMode : - SortMode.values()) { + SortMode.values()) { if (sortMode.getValue() == i) return sortMode; } return SortMode.RELEASE_DATE; diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/attend/GameBalanceParameter.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/common/attend/GameBalanceParameter.java index f7353a87..4b7f5e9b 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/attend/GameBalanceParameter.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/common/attend/GameBalanceParameter.java @@ -19,76 +19,76 @@ public class GameBalanceParameter implements Internalizable { private int name_change_price = 100; private GameBalanceTrialBidSet easy_trials = new GameBalanceTrialBidSet( - new GameBalanceTrialBid(5, 10), - new GameBalanceTrialBid(10, 25), - new GameBalanceTrialBid(20, 50), - new GameBalanceTrialBid(30, 90) + new GameBalanceTrialBid(5, 10), + new GameBalanceTrialBid(10, 25), + new GameBalanceTrialBid(20, 50), + new GameBalanceTrialBid(30, 90) ); private GameBalanceTrialBidSet normal_trials = new GameBalanceTrialBidSet( - new GameBalanceTrialBid(5, 10), - new GameBalanceTrialBid(10, 25), - new GameBalanceTrialBid(20, 50), - new GameBalanceTrialBid(30, 90) + new GameBalanceTrialBid(5, 10), + new GameBalanceTrialBid(10, 25), + new GameBalanceTrialBid(20, 50), + new GameBalanceTrialBid(30, 90) ); private GameBalanceTrialBidSet hard_trials = new GameBalanceTrialBidSet( - new GameBalanceTrialBid(5, 10), - new GameBalanceTrialBid(10, 25), - new GameBalanceTrialBid(20, 50), - new GameBalanceTrialBid(30, 90) + new GameBalanceTrialBid(5, 10), + new GameBalanceTrialBid(10, 25), + new GameBalanceTrialBid(20, 50), + new GameBalanceTrialBid(30, 90) ); private GameBalanceTrialBidSet extreme_trials = new GameBalanceTrialBidSet( - new GameBalanceTrialBid(5, 10), - new GameBalanceTrialBid(10, 25), - new GameBalanceTrialBid(20, 50), - new GameBalanceTrialBid(30, 90) + new GameBalanceTrialBid(5, 10), + new GameBalanceTrialBid(10, 25), + new GameBalanceTrialBid(20, 50), + new GameBalanceTrialBid(30, 90) ); private GameBalanceTrialBidSet extra_extreme_trials = new GameBalanceTrialBidSet( - new GameBalanceTrialBid(5, 10), - new GameBalanceTrialBid(10, 25), - new GameBalanceTrialBid(20, 50), - new GameBalanceTrialBid(30, 90) + new GameBalanceTrialBid(5, 10), + new GameBalanceTrialBid(10, 25), + new GameBalanceTrialBid(20, 50), + new GameBalanceTrialBid(30, 90) ); @Override public String toInternal() { Integer[] arr = new Integer[]{ - this.name_change_price, - 0, // unkn - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 2, - 3, - 4, // unkn - 1, - 1, - 1, - 3, - 4, - 5, // unkn - 1, - 1, - 1, - 4, - 5, - 6, // unkn - 1, - 1, - 1, - 5, - 6, - 7, // unkn - 4, - 4, - 4, - 9, - 10, - 14 // unkn + this.name_change_price, + 0, // unkn + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 2, + 3, + 4, // unkn + 1, + 1, + 1, + 3, + 4, + 5, // unkn + 1, + 1, + 1, + 4, + 5, + 6, // unkn + 1, + 1, + 1, + 5, + 6, + 7, // unkn + 4, + 4, + 4, + 9, + 10, + 14 // unkn }; List list = new LinkedList<>(Arrays.asList(arr)); list.addAll(easy_trials.getArr()); diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/attend/GameBalanceTrialBidSet.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/common/attend/GameBalanceTrialBidSet.java index 4b726097..9fddfdd7 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/attend/GameBalanceTrialBidSet.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/common/attend/GameBalanceTrialBidSet.java @@ -20,14 +20,14 @@ public class GameBalanceTrialBidSet { public List getArr() { Integer[] arr = new Integer[]{ - clear.getPay(), - clear.getWin(), - great.getPay(), - great.getWin(), - excellent.getPay(), - excellent.getWin(), - perfect.getPay(), - perfect.getWin(), + clear.getPay(), + clear.getWin(), + great.getPay(), + great.getWin(), + excellent.getPay(), + excellent.getWin(), + perfect.getPay(), + perfect.getWin(), }; return new LinkedList<>(Arrays.asList(arr)); } 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 index c02bc310..5e05c112 100644 --- 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 @@ -74,6 +74,6 @@ public class FestaCollection { } public String getLastUpdateTime() { - return DivaDateTimeUtil.getString(this.firstFesta.getCreateDate().compareTo(this.secondFesta.getCreateDate()) < 0 ? this.firstFesta.getCreateDate() : this.secondFesta.getCreateDate()); + return DivaDateTimeUtil.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/gamedata/Contest.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/Contest.java index 3f448410..1af5f2b5 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/Contest.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/Contest.java @@ -126,18 +126,18 @@ public class Contest implements Serializable { String[] ids = groups[i - 1].split(":"); list.add(ids[0]); list.add(ids[1]); - if(StringUtils.isBlank(pvDiffList) || !pvDiffList.contains(":")) { + if (StringUtils.isBlank(pvDiffList) || !pvDiffList.contains(":")) { list.add(this.minComplexity); list.add(this.maxComplexity); list.add(-1); } else { String[] diffList = pvDiffList.split(","); - if(diffList.length < i) { + if (diffList.length < i) { list.add(this.minComplexity); list.add(this.maxComplexity); list.add(-1); } else { - String[] diff = diffList[i-1].split(":"); + String[] diff = diffList[i - 1].split(":"); list.add(diff[1]); list.add(diff[2]); list.add(diff[0]); diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/Difficulty.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/Difficulty.java index 379d0240..f866586a 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/Difficulty.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/Difficulty.java @@ -7,7 +7,7 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * @author samnyan (privateamusement@protonmail.com) + * @author samnyan (privateamusement@protonmail.com) */ @Entity(name = "DivaPvLevel") @Table(name = "diva_pv_info_level") diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/DivaCustomize.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/DivaCustomize.java index 21b771b1..dab0496a 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/DivaCustomize.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/DivaCustomize.java @@ -41,10 +41,10 @@ public class DivaCustomize implements Serializable, Internalizable { @Override public String toInternal() { return id + ",0," + - URIEncoder.encode(name) + "," + - price + "," + - DivaDateTimeUtil.format(releaseDate) + "," + - DivaDateTimeUtil.format(endDate) + "," + - sortOrder; + URIEncoder.encode(name) + "," + + price + "," + + DivaDateTimeUtil.format(releaseDate) + "," + + DivaDateTimeUtil.format(endDate) + "," + + sortOrder; } } diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/DivaModule.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/DivaModule.java index e3bd9a15..d38fb844 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/DivaModule.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/DivaModule.java @@ -41,10 +41,10 @@ public class DivaModule implements Serializable, Internalizable { @Override public String toInternal() { return id + ",0," + - URIEncoder.encode(name) + "," + - price + "," + - DivaDateTimeUtil.format(releaseDate) + "," + - DivaDateTimeUtil.format(endDate) + "," + - sortOrder; + URIEncoder.encode(name) + "," + + price + "," + + DivaDateTimeUtil.format(releaseDate) + "," + + DivaDateTimeUtil.format(endDate) + "," + + sortOrder; } } diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/Pv.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/Pv.java index 191f0049..228840b6 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/Pv.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/Pv.java @@ -9,15 +9,14 @@ import java.io.Serializable; import java.util.Map; /** - * @author samnyan (privateamusement@protonmail.com) + * @author samnyan (privateamusement@protonmail.com) */ @Entity(name = "DivaPvInfo") @Table(name = "diva_pv_info") @Data @AllArgsConstructor @NoArgsConstructor -public class Pv implements Serializable -{ +public class Pv implements Serializable { private static final long serialVersionUID = 1L; @Id diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/util/DivaUtils.kt b/src/main/java/icu/samnyan/aqua/sega/diva/util/DivaUtils.kt index 2cc1e94e..61e4bdf1 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/util/DivaUtils.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/util/DivaUtils.kt @@ -23,6 +23,7 @@ object DivaDateTimeUtil { @JvmStatic fun getString(time: LocalDateTime) = URIEncoder.encode(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.0").format(time)) + @JvmStatic fun format(time: LocalDateTime) = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.0").format(time) }