diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/Splatoon3Api.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/Splatoon3Api.kt
similarity index 97%
rename from src/main/kotlin/net/moonleay/lilJudd/data/api/Splatoon3Api.kt
rename to src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/Splatoon3Api.kt
index 92ad889..8f097c3 100644
--- a/src/main/kotlin/net/moonleay/lilJudd/data/api/Splatoon3Api.kt
+++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/Splatoon3Api.kt
@@ -16,9 +16,9 @@
* along with this program. If not, see .
*/
-package net.moonleay.lilJudd.data.api
+package net.moonleay.lilJudd.data.api.splatoon3ink
-import net.moonleay.lilJudd.data.api.entry.schedule.ModeData
+import net.moonleay.lilJudd.data.api.splatoon3ink.entry.schedule.ModeData
import net.moonleay.lilJudd.util.TimeUtil
object Splatoon3Api {
diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/Splatoon3ApiCache.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/Splatoon3ApiCache.kt
similarity index 95%
rename from src/main/kotlin/net/moonleay/lilJudd/data/api/Splatoon3ApiCache.kt
rename to src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/Splatoon3ApiCache.kt
index daba96d..30a9129 100644
--- a/src/main/kotlin/net/moonleay/lilJudd/data/api/Splatoon3ApiCache.kt
+++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/Splatoon3ApiCache.kt
@@ -16,21 +16,21 @@
* along with this program. If not, see .
*/
-package net.moonleay.lilJudd.data.api
+package net.moonleay.lilJudd.data.api.splatoon3ink
import io.ktor.http.*
import kotlinx.serialization.json.*
-import net.moonleay.lilJudd.data.api.entry.coop.CoopGearData
-import net.moonleay.lilJudd.data.api.entry.schedule.*
-import net.moonleay.lilJudd.data.api.entry.splatfest.SplatfestColor
-import net.moonleay.lilJudd.data.api.entry.splatfest.SplatfestData
-import net.moonleay.lilJudd.data.api.entry.splatfest.SplatfestTeamData
-import net.moonleay.lilJudd.data.api.entry.splatfest.SplatfestTeamResults
-import net.moonleay.lilJudd.data.api.entry.splatnet.BrandData
-import net.moonleay.lilJudd.data.api.entry.splatnet.GearAbilityData
-import net.moonleay.lilJudd.data.api.entry.splatnet.SplatnetItemData
-import net.moonleay.lilJudd.data.api.type.ApiDataType
-import net.moonleay.lilJudd.data.api.type.ApiRequestType
+import net.moonleay.lilJudd.data.api.splatoon3ink.entry.coop.CoopGearData
+import net.moonleay.lilJudd.data.api.splatoon3ink.entry.schedule.*
+import net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatfest.SplatfestColor
+import net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatfest.SplatfestData
+import net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatfest.SplatfestTeamData
+import net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatfest.SplatfestTeamResults
+import net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatnet.BrandData
+import net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatnet.GearAbilityData
+import net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatnet.SplatnetItemData
+import net.moonleay.lilJudd.data.api.splatoon3ink.type.ApiDataType
+import net.moonleay.lilJudd.data.api.splatoon3ink.type.ApiRequestType
import net.moonleay.lilJudd.util.Logger
import net.moonleay.lilJudd.util.NetUtil
import net.moonleay.liljudd.build.BuildConstants
@@ -49,13 +49,14 @@ object Splatoon3ApiCache {
internal var cachedChallengesData = mutableListOf()
internal var cachedShiftData = mutableListOf()
internal var cachedBigRunShiftData = mutableListOf()
- internal var cachedCoopRewardsData = mutableListOf()
+ internal var cachedCoopRewardsData =
+ mutableListOf()
internal var cachedSplatnetItemData = mutableListOf()
internal var cachedSplatnetLimitedItemData = mutableListOf()
internal lateinit var splatnetShopBrandData: BrandData
internal lateinit var splatnetShopNextBrandData: BrandData
fun updateData(dataType: ApiDataType, requestType: ApiRequestType) {
- Logger.out("Updating data for $dataType with USER-AGENT: $user_agent")
+ Logger.out("Updating data for $dataType with USER-AGENT: ${user_agent}")
Logger.out("Reason for update: $requestType")
when (dataType) {
ApiDataType.SCHEDULES -> {
@@ -225,11 +226,12 @@ object Splatoon3ApiCache {
val obj = it as JsonObject
val imageURL = Url(obj.jsonObject["originalImage"]!!.jsonObject["url"]!!.jsonPrimitive.content)
val id = obj.jsonObject["vsStageId"]!!.jsonPrimitive.int
- cachedMapData[id] = MapData(
- id,
- imageURL,
- it.jsonObject["name"]!!.jsonPrimitive.content
- )
+ cachedMapData[id] =
+ MapData(
+ id,
+ imageURL,
+ it.jsonObject["name"]!!.jsonPrimitive.content
+ )
}
Logger.out("Updated maplist data")
} catch (e: Exception) {
diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/coop/CoopGearData.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/coop/CoopGearData.kt
similarity index 93%
rename from src/main/kotlin/net/moonleay/lilJudd/data/api/entry/coop/CoopGearData.kt
rename to src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/coop/CoopGearData.kt
index 4f46642..817a80a 100644
--- a/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/coop/CoopGearData.kt
+++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/coop/CoopGearData.kt
@@ -16,7 +16,7 @@
* along with this program. If not, see .
*/
-package net.moonleay.lilJudd.data.api.entry.coop
+package net.moonleay.lilJudd.data.api.splatoon3ink.entry.coop
import io.ktor.http.*
diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/schedule/ChallengeModeData.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/schedule/ChallengeModeData.kt
similarity index 94%
rename from src/main/kotlin/net/moonleay/lilJudd/data/api/entry/schedule/ChallengeModeData.kt
rename to src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/schedule/ChallengeModeData.kt
index c288fe9..87efd9d 100644
--- a/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/schedule/ChallengeModeData.kt
+++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/schedule/ChallengeModeData.kt
@@ -16,7 +16,7 @@
* along with this program. If not, see .
*/
-package net.moonleay.lilJudd.data.api.entry.schedule
+package net.moonleay.lilJudd.data.api.splatoon3ink.entry.schedule
data class ChallengeModeData(
val leagueMatchEventId: String,
diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/schedule/MapData.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/schedule/MapData.kt
similarity index 92%
rename from src/main/kotlin/net/moonleay/lilJudd/data/api/entry/schedule/MapData.kt
rename to src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/schedule/MapData.kt
index 422783c..b64755d 100644
--- a/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/schedule/MapData.kt
+++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/schedule/MapData.kt
@@ -16,7 +16,7 @@
* along with this program. If not, see .
*/
-package net.moonleay.lilJudd.data.api.entry.schedule
+package net.moonleay.lilJudd.data.api.splatoon3ink.entry.schedule
import io.ktor.http.*
diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/schedule/ModeData.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/schedule/ModeData.kt
similarity index 93%
rename from src/main/kotlin/net/moonleay/lilJudd/data/api/entry/schedule/ModeData.kt
rename to src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/schedule/ModeData.kt
index 8295a1a..c3ad3dc 100644
--- a/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/schedule/ModeData.kt
+++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/schedule/ModeData.kt
@@ -16,7 +16,7 @@
* along with this program. If not, see .
*/
-package net.moonleay.lilJudd.data.api.entry.schedule
+package net.moonleay.lilJudd.data.api.splatoon3ink.entry.schedule
data class ModeData(
val startTime: String,
diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/schedule/ShiftData.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/schedule/ShiftData.kt
similarity index 94%
rename from src/main/kotlin/net/moonleay/lilJudd/data/api/entry/schedule/ShiftData.kt
rename to src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/schedule/ShiftData.kt
index a4d28ae..f6f29f1 100644
--- a/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/schedule/ShiftData.kt
+++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/schedule/ShiftData.kt
@@ -16,7 +16,7 @@
* along with this program. If not, see .
*/
-package net.moonleay.lilJudd.data.api.entry.schedule
+package net.moonleay.lilJudd.data.api.splatoon3ink.entry.schedule
import io.ktor.http.*
diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/schedule/TimePeriodData.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/schedule/TimePeriodData.kt
similarity index 92%
rename from src/main/kotlin/net/moonleay/lilJudd/data/api/entry/schedule/TimePeriodData.kt
rename to src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/schedule/TimePeriodData.kt
index 53edb96..dc66844 100644
--- a/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/schedule/TimePeriodData.kt
+++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/schedule/TimePeriodData.kt
@@ -16,7 +16,7 @@
* along with this program. If not, see .
*/
-package net.moonleay.lilJudd.data.api.entry.schedule
+package net.moonleay.lilJudd.data.api.splatoon3ink.entry.schedule
data class TimePeriodData(
val startTime: String,
diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/schedule/WeaponData.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/schedule/WeaponData.kt
similarity index 92%
rename from src/main/kotlin/net/moonleay/lilJudd/data/api/entry/schedule/WeaponData.kt
rename to src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/schedule/WeaponData.kt
index 997a24b..025ef87 100644
--- a/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/schedule/WeaponData.kt
+++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/schedule/WeaponData.kt
@@ -16,7 +16,7 @@
* along with this program. If not, see .
*/
-package net.moonleay.lilJudd.data.api.entry.schedule
+package net.moonleay.lilJudd.data.api.splatoon3ink.entry.schedule
import io.ktor.http.*
diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatfest/SplatfestColor.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatfest/SplatfestColor.kt
similarity index 92%
rename from src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatfest/SplatfestColor.kt
rename to src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatfest/SplatfestColor.kt
index 391ccb3..9f61bd7 100644
--- a/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatfest/SplatfestColor.kt
+++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatfest/SplatfestColor.kt
@@ -16,7 +16,7 @@
* along with this program. If not, see .
*/
-package net.moonleay.lilJudd.data.api.entry.splatfest
+package net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatfest
data class SplatfestColor(
val a: Int,
diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatfest/SplatfestData.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatfest/SplatfestData.kt
similarity index 93%
rename from src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatfest/SplatfestData.kt
rename to src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatfest/SplatfestData.kt
index f52b9b4..fb11b19 100644
--- a/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatfest/SplatfestData.kt
+++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatfest/SplatfestData.kt
@@ -16,7 +16,7 @@
* along with this program. If not, see .
*/
-package net.moonleay.lilJudd.data.api.entry.splatfest
+package net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatfest
import io.ktor.http.*
diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatfest/SplatfestTeamData.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatfest/SplatfestTeamData.kt
similarity index 92%
rename from src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatfest/SplatfestTeamData.kt
rename to src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatfest/SplatfestTeamData.kt
index 9ea2e72..b29ee85 100644
--- a/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatfest/SplatfestTeamData.kt
+++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatfest/SplatfestTeamData.kt
@@ -16,7 +16,7 @@
* along with this program. If not, see .
*/
-package net.moonleay.lilJudd.data.api.entry.splatfest
+package net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatfest
data class SplatfestTeamData(
val teamName: String,
diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatfest/SplatfestTeamResults.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatfest/SplatfestTeamResults.kt
similarity index 94%
rename from src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatfest/SplatfestTeamResults.kt
rename to src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatfest/SplatfestTeamResults.kt
index 4888adc..ff7b531 100644
--- a/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatfest/SplatfestTeamResults.kt
+++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatfest/SplatfestTeamResults.kt
@@ -16,7 +16,7 @@
* along with this program. If not, see .
*/
-package net.moonleay.lilJudd.data.api.entry.splatfest
+package net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatfest
data class SplatfestTeamResults(
val isWinner: Boolean,
diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatnet/BrandData.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatnet/BrandData.kt
similarity index 92%
rename from src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatnet/BrandData.kt
rename to src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatnet/BrandData.kt
index 6781172..2c80240 100644
--- a/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatnet/BrandData.kt
+++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatnet/BrandData.kt
@@ -16,7 +16,7 @@
* along with this program. If not, see .
*/
-package net.moonleay.lilJudd.data.api.entry.splatnet
+package net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatnet
import io.ktor.http.*
diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatnet/GearAbilityData.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatnet/GearAbilityData.kt
similarity index 92%
rename from src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatnet/GearAbilityData.kt
rename to src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatnet/GearAbilityData.kt
index 713d946..81f2ee7 100644
--- a/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatnet/GearAbilityData.kt
+++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatnet/GearAbilityData.kt
@@ -16,7 +16,7 @@
* along with this program. If not, see .
*/
-package net.moonleay.lilJudd.data.api.entry.splatnet
+package net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatnet
import io.ktor.http.*
diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatnet/SplatnetItemData.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatnet/SplatnetItemData.kt
similarity index 93%
rename from src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatnet/SplatnetItemData.kt
rename to src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatnet/SplatnetItemData.kt
index 43df20b..72268dd 100644
--- a/src/main/kotlin/net/moonleay/lilJudd/data/api/entry/splatnet/SplatnetItemData.kt
+++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatnet/SplatnetItemData.kt
@@ -16,7 +16,7 @@
* along with this program. If not, see .
*/
-package net.moonleay.lilJudd.data.api.entry.splatnet
+package net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatnet
import io.ktor.http.*
diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/type/ApiDataType.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/type/ApiDataType.kt
similarity index 93%
rename from src/main/kotlin/net/moonleay/lilJudd/data/api/type/ApiDataType.kt
rename to src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/type/ApiDataType.kt
index 7123b0d..7cb7361 100644
--- a/src/main/kotlin/net/moonleay/lilJudd/data/api/type/ApiDataType.kt
+++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/type/ApiDataType.kt
@@ -16,7 +16,7 @@
* along with this program. If not, see .
*/
-package net.moonleay.lilJudd.data.api.type
+package net.moonleay.lilJudd.data.api.splatoon3ink.type
enum class ApiDataType {
SCHEDULES,
diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/api/type/ApiRequestType.kt b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/type/ApiRequestType.kt
similarity index 94%
rename from src/main/kotlin/net/moonleay/lilJudd/data/api/type/ApiRequestType.kt
rename to src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/type/ApiRequestType.kt
index da20371..03a9add 100644
--- a/src/main/kotlin/net/moonleay/lilJudd/data/api/type/ApiRequestType.kt
+++ b/src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/type/ApiRequestType.kt
@@ -16,7 +16,7 @@
* along with this program. If not, see .
*/
-package net.moonleay.lilJudd.data.api.type
+package net.moonleay.lilJudd.data.api.splatoon3ink.type
enum class ApiRequestType(val nameToDisplay: String) {
AUTOMATIC_CACHE_UPDATE("automatic request to update the cache"),