refactor: splatoon3ink api

Signed-off-by: moonleay <contact@moonleay.net>

src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/Splatoon3Api.kt

@@ -16,9 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-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 {

src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/Splatoon3ApiCache.kt

@@ -16,21 +16,21 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-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.splatoon3ink.entry.coop.CoopGearData
-import net.moonleay.lilJudd.data.api.entry.schedule.*
+import net.moonleay.lilJudd.data.api.splatoon3ink.entry.schedule.*
-import net.moonleay.lilJudd.data.api.entry.splatfest.SplatfestColor
+import net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatfest.SplatfestColor
-import net.moonleay.lilJudd.data.api.entry.splatfest.SplatfestData
+import net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatfest.SplatfestData
-import net.moonleay.lilJudd.data.api.entry.splatfest.SplatfestTeamData
+import net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatfest.SplatfestTeamData
-import net.moonleay.lilJudd.data.api.entry.splatfest.SplatfestTeamResults
+import net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatfest.SplatfestTeamResults
-import net.moonleay.lilJudd.data.api.entry.splatnet.BrandData
+import net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatnet.BrandData
-import net.moonleay.lilJudd.data.api.entry.splatnet.GearAbilityData
+import net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatnet.GearAbilityData
-import net.moonleay.lilJudd.data.api.entry.splatnet.SplatnetItemData
+import net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatnet.SplatnetItemData
-import net.moonleay.lilJudd.data.api.type.ApiDataType
+import net.moonleay.lilJudd.data.api.splatoon3ink.type.ApiDataType
-import net.moonleay.lilJudd.data.api.type.ApiRequestType
+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<ChallengeModeData>()
     internal var cachedShiftData = mutableListOf<ShiftData>()
     internal var cachedBigRunShiftData = mutableListOf<ShiftData>()
-    internal var cachedCoopRewardsData = mutableListOf<CoopGearData>()
+    internal var cachedCoopRewardsData =
+        mutableListOf<CoopGearData>()
     internal var cachedSplatnetItemData = mutableListOf<SplatnetItemData>()
     internal var cachedSplatnetLimitedItemData = mutableListOf<SplatnetItemData>()
     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(
+                cachedMapData[id] =
-                    id,
+                    MapData(
-                    imageURL,
+                        id,
-                    it.jsonObject["name"]!!.jsonPrimitive.content
+                        imageURL,
-                )
+                        it.jsonObject["name"]!!.jsonPrimitive.content
+                    )
             }
             Logger.out("Updated maplist data")
         } catch (e: Exception) {

src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/coop/CoopGearData.kt

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package net.moonleay.lilJudd.data.api.entry.coop
+package net.moonleay.lilJudd.data.api.splatoon3ink.entry.coop
 
 import io.ktor.http.*
 

src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/schedule/ChallengeModeData.kt

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package net.moonleay.lilJudd.data.api.entry.schedule
+package net.moonleay.lilJudd.data.api.splatoon3ink.entry.schedule
 
 data class ChallengeModeData(
     val leagueMatchEventId: String,

src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/schedule/MapData.kt

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package net.moonleay.lilJudd.data.api.entry.schedule
+package net.moonleay.lilJudd.data.api.splatoon3ink.entry.schedule
 
 import io.ktor.http.*
 

src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/schedule/ModeData.kt

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package net.moonleay.lilJudd.data.api.entry.schedule
+package net.moonleay.lilJudd.data.api.splatoon3ink.entry.schedule
 
 data class ModeData(
     val startTime: String,

src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/schedule/ShiftData.kt

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package net.moonleay.lilJudd.data.api.entry.schedule
+package net.moonleay.lilJudd.data.api.splatoon3ink.entry.schedule
 
 import io.ktor.http.*
 

src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/schedule/TimePeriodData.kt

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package net.moonleay.lilJudd.data.api.entry.schedule
+package net.moonleay.lilJudd.data.api.splatoon3ink.entry.schedule
 
 data class TimePeriodData(
     val startTime: String,

src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/schedule/WeaponData.kt

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package net.moonleay.lilJudd.data.api.entry.schedule
+package net.moonleay.lilJudd.data.api.splatoon3ink.entry.schedule
 
 import io.ktor.http.*
 

src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatfest/SplatfestColor.kt

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package net.moonleay.lilJudd.data.api.entry.splatfest
+package net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatfest
 
 data class SplatfestColor(
     val a: Int,

src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatfest/SplatfestData.kt

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package net.moonleay.lilJudd.data.api.entry.splatfest
+package net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatfest
 
 import io.ktor.http.*
 

src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatfest/SplatfestTeamData.kt

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package net.moonleay.lilJudd.data.api.entry.splatfest
+package net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatfest
 
 data class SplatfestTeamData(
     val teamName: String,

src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatfest/SplatfestTeamResults.kt

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package net.moonleay.lilJudd.data.api.entry.splatfest
+package net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatfest
 
 data class SplatfestTeamResults(
     val isWinner: Boolean,

src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatnet/BrandData.kt

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package net.moonleay.lilJudd.data.api.entry.splatnet
+package net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatnet
 
 import io.ktor.http.*
 

src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatnet/GearAbilityData.kt

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package net.moonleay.lilJudd.data.api.entry.splatnet
+package net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatnet
 
 import io.ktor.http.*
 

src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/entry/splatnet/SplatnetItemData.kt

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package net.moonleay.lilJudd.data.api.entry.splatnet
+package net.moonleay.lilJudd.data.api.splatoon3ink.entry.splatnet
 
 import io.ktor.http.*
 

src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/type/ApiDataType.kt

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package net.moonleay.lilJudd.data.api.type
+package net.moonleay.lilJudd.data.api.splatoon3ink.type
 
 enum class ApiDataType {
     SCHEDULES,

src/main/kotlin/net/moonleay/lilJudd/data/api/splatoon3ink/type/ApiRequestType.kt

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-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"),