From b7cd09a0c6f8229bd3ed287d03e262c90a91155e Mon Sep 17 00:00:00 2001
From: Lycoon <hugo.bois@hotmail.fr>
Date: Sun, 19 Nov 2023 15:01:54 +0100
Subject: [PATCH 1/7] feat: working on updating API

---
 .../java/com/lycoon/clashapi/core/ClashAPI.kt | 45 ++++++++++++-------
 .../clashapi/core/QueryParametersBuilder.kt   | 21 +++++++++
 .../models/capital/CapitalRaidSeason.kt       | 19 ++++++++
 .../models/capital/CapitalRaidSeasonAttack.kt | 10 +++++
 .../capital/CapitalRaidSeasonAttackLog.kt     | 12 +++++
 .../capital/CapitalRaidSeasonAttacker.kt      |  9 ++++
 .../capital/CapitalRaidSeasonClanInfo.kt      | 12 +++++
 .../capital/CapitalRaidSeasonDefenseLog.kt    | 12 +++++
 .../capital/CapitalRaidSeasonDistrict.kt      | 15 +++++++
 .../models/capital/CapitalRaidSeasonMember.kt | 13 ++++++
 .../com/lycoon/clashapi/models/clan/Clan.kt   | 15 +++++--
 .../lycoon/clashapi/models/clan/ClanList.kt   |  6 ---
 .../lycoon/clashapi/models/clan/ClanMember.kt |  3 +-
 .../clashapi/models/clan/ClanMemberList.kt    |  6 ---
 .../clashapi/models/clan/ClanRanking.kt       |  2 +-
 .../clashapi/models/clan/ClanRankingList.kt   |  6 ---
 .../clashapi/models/clan/ClanVersusRanking.kt |  6 ++-
 .../models/clan/ClanVersusRankingList.kt      |  6 ---
 .../clashapi/models/common/BadgeUrls.kt       |  6 ++-
 .../lycoon/clashapi/models/common/Label.kt    |  6 ++-
 .../clashapi/models/common/LabelList.kt       |  6 ---
 .../lycoon/clashapi/models/common/Language.kt |  6 ++-
 .../clashapi/models/common/LocationList.kt    |  6 ---
 .../clashapi/models/common/TokenResponse.kt   |  6 ++-
 .../{LeagueList.kt => BuilderBaseLeague.kt}   | 15 ++++---
 .../lycoon/clashapi/models/league/League.kt   |  6 ++-
 .../models/league/LeagueSeasonList.kt         |  6 ---
 .../models/league/LegendSeasonResult.kt       |  6 ++-
 .../clashapi/models/player/Achievement.kt     |  2 +-
 .../lycoon/clashapi/models/player/Player.kt   | 23 +++++++---
 .../clashapi/models/player/PlayerClan.kt      |  7 ++-
 .../{PlayerRankingList.kt => PlayerHouse.kt}  | 14 +++---
 .../models/player/PlayerHouseElement.kt       | 11 +++++
 .../models/player/PlayerLegendStatistics.kt   |  6 ++-
 .../clashapi/models/player/PlayerRanking.kt   |  2 +-
 .../models/player/PlayerRankingClan.kt        |  6 ++-
 .../models/player/PlayerVersusRanking.kt      |  3 +-
 .../models/player/PlayerVersusRankingList.kt  |  6 ---
 .../lycoon/clashapi/models/player/Troop.kt    |  8 ++--
 .../com/lycoon/clashapi/models/war/War.kt     | 10 ++++-
 .../lycoon/clashapi/models/war/WarMember.kt   |  2 +-
 .../lycoon/clashapi/models/war/WarlogClan.kt  |  3 +-
 .../lycoon/clashapi/models/war/WarlogEntry.kt |  7 ++-
 .../clashapi/models/warleague/WarLeague.kt    |  5 ++-
 .../models/warleague/WarLeagueGroup.kt        |  6 ++-
 .../models/warleague/WarLeagueList.kt         |  6 ---
 .../models/warleague/WarLeagueMember.kt       |  6 ++-
 .../models/warleague/WarLeagueRound.kt        |  4 +-
 src/test/java/ClashAPITest.kt                 | 27 ++++++++++-
 49 files changed, 329 insertions(+), 122 deletions(-)
 create mode 100644 src/main/java/com/lycoon/clashapi/core/QueryParametersBuilder.kt
 create mode 100644 src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeason.kt
 create mode 100644 src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonAttack.kt
 create mode 100644 src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonAttackLog.kt
 create mode 100644 src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonAttacker.kt
 create mode 100644 src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonClanInfo.kt
 create mode 100644 src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonDefenseLog.kt
 create mode 100644 src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonDistrict.kt
 create mode 100644 src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonMember.kt
 delete mode 100644 src/main/java/com/lycoon/clashapi/models/clan/ClanList.kt
 delete mode 100644 src/main/java/com/lycoon/clashapi/models/clan/ClanMemberList.kt
 delete mode 100644 src/main/java/com/lycoon/clashapi/models/clan/ClanRankingList.kt
 delete mode 100644 src/main/java/com/lycoon/clashapi/models/clan/ClanVersusRankingList.kt
 delete mode 100644 src/main/java/com/lycoon/clashapi/models/common/LabelList.kt
 delete mode 100644 src/main/java/com/lycoon/clashapi/models/common/LocationList.kt
 rename src/main/java/com/lycoon/clashapi/models/league/{LeagueList.kt => BuilderBaseLeague.kt} (54%)
 delete mode 100644 src/main/java/com/lycoon/clashapi/models/league/LeagueSeasonList.kt
 rename src/main/java/com/lycoon/clashapi/models/player/{PlayerRankingList.kt => PlayerHouse.kt} (59%)
 create mode 100644 src/main/java/com/lycoon/clashapi/models/player/PlayerHouseElement.kt
 delete mode 100644 src/main/java/com/lycoon/clashapi/models/player/PlayerVersusRankingList.kt
 delete mode 100644 src/main/java/com/lycoon/clashapi/models/warleague/WarLeagueList.kt

diff --git a/src/main/java/com/lycoon/clashapi/core/ClashAPI.kt b/src/main/java/com/lycoon/clashapi/core/ClashAPI.kt
index 6569f09..5672d63 100644
--- a/src/main/java/com/lycoon/clashapi/core/ClashAPI.kt
+++ b/src/main/java/com/lycoon/clashapi/core/ClashAPI.kt
@@ -4,19 +4,17 @@ import com.lycoon.clashapi.core.CoreUtils.deserialize
 import com.lycoon.clashapi.core.CoreUtils.formatTag
 import com.lycoon.clashapi.core.CoreUtils.checkResponse
 import com.lycoon.clashapi.core.exception.ClashAPIException
+import com.lycoon.clashapi.models.capital.CapitalRaidSeason
 import com.lycoon.clashapi.models.clan.*
 import com.lycoon.clashapi.models.common.*
 import com.lycoon.clashapi.models.league.League
-import com.lycoon.clashapi.models.league.LeagueList
 import com.lycoon.clashapi.models.league.LeagueSeason
-import com.lycoon.clashapi.models.league.LeagueSeasonList
 import com.lycoon.clashapi.models.player.*
 import com.lycoon.clashapi.models.war.War
 import com.lycoon.clashapi.models.war.Warlog
 import com.lycoon.clashapi.models.war.WarlogEntry
 import com.lycoon.clashapi.models.warleague.WarLeague
 import com.lycoon.clashapi.models.warleague.WarLeagueGroup
-import com.lycoon.clashapi.models.warleague.WarLeagueList
 import okhttp3.*
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.RequestBody.Companion.toRequestBody
@@ -153,7 +151,24 @@ class ClashAPI(private val token: String) {
     fun getClanMembers(clanTag: String): List<ClanMember> {
         val tag = formatTag(clanTag)
         val res = get("/clans/$tag/members")
-        return deserialize<ClanMemberList>(res).items
+        return deserialize(res)
+    }
+
+    /**
+     * Returns the capital raid seasons of clan attached to the tag.
+     *
+     * @param clanTag `String` of the clan's tag
+     * @return List<CapitalRaidSeason>
+     * @see CapitalRaidSeason
+     *
+     * @throws IOException if the deserialization failed
+     * @throws ClashAPIException if the request to the game API failed
+     */
+    @Throws(IOException::class, ClashAPIException::class)
+    fun getCapitalRaidSeasons(clanTag: String): List<CapitalRaidSeason> {
+        val tag = formatTag(clanTag)
+        val res = get("/clans/$tag/capitalraidseasons")
+        return deserialize(res)
     }
 
     /**
@@ -203,7 +218,7 @@ class ClashAPI(private val token: String) {
     @Throws(IOException::class, ClashAPIException::class)
     fun getLeagues(): List<League> {
         val res = get("/leagues")
-        return deserialize<LeagueList>(res).items
+        return deserialize(res)
     }
 
     /**
@@ -220,7 +235,7 @@ class ClashAPI(private val token: String) {
     @Throws(IOException::class, ClashAPIException::class)
     fun getLeagueSeasonRankings(leagueId: String, seasonId: String): List<PlayerRanking> {
         val res = get("/leagues/$leagueId/seasons/$seasonId")
-        return deserialize<PlayerRankingList>(res).items
+        return deserialize(res)
     }
 
     /**
@@ -252,7 +267,7 @@ class ClashAPI(private val token: String) {
     @Throws(IOException::class, ClashAPIException::class)
     fun getLeagueSeasons(leagueId: String): List<LeagueSeason> {
         val res = get("/leagues/$leagueId/seasons")
-        return deserialize<LeagueSeasonList>(res).items
+        return deserialize(res)
     }
 
     /**
@@ -283,7 +298,7 @@ class ClashAPI(private val token: String) {
     @Throws(IOException::class, ClashAPIException::class)
     fun getWarLeagues(): List<WarLeague> {
         val res = get("/warleagues")
-        return deserialize<WarLeagueList>(res).items
+        return deserialize(res)
     }
 
     /**
@@ -299,7 +314,7 @@ class ClashAPI(private val token: String) {
     @Throws(IOException::class, ClashAPIException::class)
     fun getClanRankings(locationId: String): List<ClanRanking> {
         val res = get("/locations/${locationId}/rankings/clans")
-        return deserialize<ClanRankingList>(res).items
+        return deserialize(res)
     }
 
     /**
@@ -315,7 +330,7 @@ class ClashAPI(private val token: String) {
     @Throws(IOException::class, ClashAPIException::class)
     fun getClanVersusRankings(locationId: String): List<ClanVersusRanking> {
         val res = get("/locations/${locationId}/rankings/clans-versus")
-        return deserialize<ClanVersusRankingList>(res).items
+        return deserialize(res)
     }
 
     /**
@@ -331,7 +346,7 @@ class ClashAPI(private val token: String) {
     @Throws(IOException::class, ClashAPIException::class)
     fun getPlayerRankings(locationId: String): List<PlayerRanking> {
         val res = get("/locations/${locationId}/rankings/players")
-        return deserialize<PlayerRankingList>(res).items
+        return deserialize(res)
     }
 
     /**
@@ -347,7 +362,7 @@ class ClashAPI(private val token: String) {
     @Throws(IOException::class, ClashAPIException::class)
     fun getPlayerVersusRankings(locationId: String): List<PlayerVersusRanking> {
         val res = get("/locations/${locationId}/rankings/players-versus")
-        return deserialize<PlayerVersusRankingList>(res).items
+        return deserialize(res)
     }
 
     /**
@@ -362,7 +377,7 @@ class ClashAPI(private val token: String) {
     @Throws(IOException::class, ClashAPIException::class)
     fun getLocations(): List<Location> {
         val res = get("/locations")
-        return deserialize<LocationList>(res).items
+        return deserialize(res)
     }
 
     /**
@@ -393,7 +408,7 @@ class ClashAPI(private val token: String) {
     @Throws(IOException::class, ClashAPIException::class)
     fun getPlayerLabels(): List<Label> {
         val res = get("/labels/players")
-        return deserialize<LabelList>(res).items
+        return deserialize(res)
     }
 
     /**
@@ -408,6 +423,6 @@ class ClashAPI(private val token: String) {
     @Throws(IOException::class, ClashAPIException::class)
     fun getClanLabels(): List<Label> {
         val res = get("/labels/clans")
-        return deserialize<LabelList>(res).items
+        return deserialize(res)
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/core/QueryParametersBuilder.kt b/src/main/java/com/lycoon/clashapi/core/QueryParametersBuilder.kt
new file mode 100644
index 0000000..d0cfab8
--- /dev/null
+++ b/src/main/java/com/lycoon/clashapi/core/QueryParametersBuilder.kt
@@ -0,0 +1,21 @@
+package com.lycoon.clashapi.core
+
+abstract class QueryBuilder()
+{
+    fun build() {}
+
+    private fun setLimit(limit: Int) { this.limit = limit; }
+    private fun setAfter(after: String) { this.after = after; }
+    private fun setBefore(before: String) { this.before = before; }
+
+    protected var limit: Int = 0;
+    protected var after: String = "";
+    protected var before: String = "";
+}
+
+abstract class WarlogQueryBuilder(): QueryBuilder()
+{
+    abstract fun setLimit(limit: Int);
+    fun setAfter(after: String) { this.after = after; }
+    fun setBefore(before: String) { this.before = before; }
+}
diff --git a/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeason.kt b/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeason.kt
new file mode 100644
index 0000000..18955eb
--- /dev/null
+++ b/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeason.kt
@@ -0,0 +1,19 @@
+package com.lycoon.clashapi.models.capital
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class CapitalRaidSeason(
+    val attackLog: List<CapitalRaidSeasonAttackLog>,
+    val defenseLog: List<CapitalRaidSeasonDefenseLog>,
+    val state: String? = null,
+    val startTime: String? = null,
+    val endTime: String? = null,
+    val capitalTotalLoot: Int? = 0,
+    val raidsCompleted: Int? = 0,
+    val totalAttacks: Int? = 0,
+    val enemyDistrictsDestroyed: Int? = 0,
+    val offensiveReward: Int? = 0,
+    val defensiveReward: Int? = 0,
+    val members: List<CapitalRaidSeasonMember>
+)
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonAttack.kt b/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonAttack.kt
new file mode 100644
index 0000000..61294eb
--- /dev/null
+++ b/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonAttack.kt
@@ -0,0 +1,10 @@
+package com.lycoon.clashapi.models.capital
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class CapitalRaidSeasonAttack(
+    val attacker: CapitalRaidSeasonAttacker,
+    val destructionPercent: Int? = 0,
+    val stars: Int? = 0
+)
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonAttackLog.kt b/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonAttackLog.kt
new file mode 100644
index 0000000..86e1c09
--- /dev/null
+++ b/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonAttackLog.kt
@@ -0,0 +1,12 @@
+package com.lycoon.clashapi.models.capital
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class CapitalRaidSeasonAttackLog(
+    val defender: CapitalRaidSeasonClanInfo,
+    val attackCount: Int? = 0,
+    val districtCount: Int? = 0,
+    val districtsDestroyed: Int? = 0,
+    val districts: List<CapitalRaidSeasonDistrict>
+)
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonAttacker.kt b/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonAttacker.kt
new file mode 100644
index 0000000..87c7a9d
--- /dev/null
+++ b/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonAttacker.kt
@@ -0,0 +1,9 @@
+package com.lycoon.clashapi.models.capital
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class CapitalRaidSeasonAttacker(
+    val tag: String? = null,
+    val name: String? = null
+)
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonClanInfo.kt b/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonClanInfo.kt
new file mode 100644
index 0000000..7acc706
--- /dev/null
+++ b/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonClanInfo.kt
@@ -0,0 +1,12 @@
+package com.lycoon.clashapi.models.capital
+
+import com.lycoon.clashapi.models.common.BadgeUrls
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class CapitalRaidSeasonClanInfo(
+    val tag: String? = null,
+    val name: String? = null,
+    val level: Int? = 0,
+    val badgeUrls: BadgeUrls? = null
+)
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonDefenseLog.kt b/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonDefenseLog.kt
new file mode 100644
index 0000000..105168f
--- /dev/null
+++ b/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonDefenseLog.kt
@@ -0,0 +1,12 @@
+package com.lycoon.clashapi.models.capital
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class CapitalRaidSeasonDefenseLog(
+    val defender: CapitalRaidSeasonClanInfo,
+    val attackCount: Int? = 0,
+    val districtCount: Int? = 0,
+    val districtsDestroyed: Int? = 0,
+    val districts: List<CapitalRaidSeasonDistrict>
+)
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonDistrict.kt b/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonDistrict.kt
new file mode 100644
index 0000000..83a3d7f
--- /dev/null
+++ b/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonDistrict.kt
@@ -0,0 +1,15 @@
+package com.lycoon.clashapi.models.capital
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class CapitalRaidSeasonDistrict(
+    val stars: Int? = 0,
+    val name: String? = null,
+    val id: Int? = 0,
+    val destructionPercent: Float? = 0f,
+    val attackCount: Int? = 0,
+    val totalLooted: Int? = 0,
+    val attacks: List<CapitalRaidSeasonAttack>,
+    val districtHallLevel: Int? = 0
+)
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonMember.kt b/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonMember.kt
new file mode 100644
index 0000000..7fd1d69
--- /dev/null
+++ b/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonMember.kt
@@ -0,0 +1,13 @@
+package com.lycoon.clashapi.models.capital
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class CapitalRaidSeasonMember(
+    val tag: String? = null,
+    val name: String? = null,
+    val attacks: Int? = 0,
+    val attackLimit: Int? = 0,
+    val bonusAttackLimit: Int? = 0,
+    val capitalResourcesLooted: Int? = 0
+)
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/clan/Clan.kt b/src/main/java/com/lycoon/clashapi/models/clan/Clan.kt
index b4c3f00..1369473 100644
--- a/src/main/java/com/lycoon/clashapi/models/clan/Clan.kt
+++ b/src/main/java/com/lycoon/clashapi/models/clan/Clan.kt
@@ -18,7 +18,7 @@ data class Clan(
     val clanVersusPoints: Int = 0,
     val tag: String? = null,
     val isWarLogPublic: Boolean = false,
-    val warFrequency: String, // UNKNOWN, ALWAYS, MORE_THAN_ONCE_PER_WEEK, ONCE_PER_WEEK, LESS_THAN_ONCE_PER_WEEK, NEVER, ANY
+    val warFrequency: Frequency,
     val clanLevel: Int = 0,
     val warWinStreak: Int = 0,
     val warWins: Int = 0,
@@ -29,8 +29,17 @@ data class Clan(
     val labels: List<Label>,
     val name: String? = null,
     val location: Location? = null,
-    val type: String? = null,
+    val type: InviteType,
     val members: Int = 0,
     val description: String? = null,
     val badgeUrls: BadgeUrls? = null
-)
\ No newline at end of file
+){
+    enum class Frequency {
+        UNKNOWN, ALWAYS, MORE_THAN_ONCE_PER_WEEK,
+        ONCE_PER_WEEK, LESS_THAN_ONCE_PER_WEEK, NEVER, ANY
+    }
+
+    enum class InviteType {
+        OPEN, INVITE_ONLY, CLOSED
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/clan/ClanList.kt b/src/main/java/com/lycoon/clashapi/models/clan/ClanList.kt
deleted file mode 100644
index c790511..0000000
--- a/src/main/java/com/lycoon/clashapi/models/clan/ClanList.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.lycoon.clashapi.models.clan
-
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class ClanList(val items: List<Clan>)
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/clan/ClanMember.kt b/src/main/java/com/lycoon/clashapi/models/clan/ClanMember.kt
index 11acfd6..a170302 100644
--- a/src/main/java/com/lycoon/clashapi/models/clan/ClanMember.kt
+++ b/src/main/java/com/lycoon/clashapi/models/clan/ClanMember.kt
@@ -1,6 +1,7 @@
 package com.lycoon.clashapi.models.clan
 
 import com.lycoon.clashapi.models.league.League
+import com.lycoon.clashapi.models.player.Player
 import kotlinx.serialization.Serializable
 
 @Serializable
@@ -8,7 +9,7 @@ data class ClanMember(
     val league: League? = null,
     val tag: String? = null,
     val name: String? = null,
-    val role: String? = null,
+    val role: Player.Role,
     val expLevel: Int = 0,
     val clanRank: Int = 0,
     val previousClanRank: Int = 0,
diff --git a/src/main/java/com/lycoon/clashapi/models/clan/ClanMemberList.kt b/src/main/java/com/lycoon/clashapi/models/clan/ClanMemberList.kt
deleted file mode 100644
index f5ae22f..0000000
--- a/src/main/java/com/lycoon/clashapi/models/clan/ClanMemberList.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.lycoon.clashapi.models.clan
-
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class ClanMemberList(val items: List<ClanMember>)
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/clan/ClanRanking.kt b/src/main/java/com/lycoon/clashapi/models/clan/ClanRanking.kt
index 19ce093..0c50717 100644
--- a/src/main/java/com/lycoon/clashapi/models/clan/ClanRanking.kt
+++ b/src/main/java/com/lycoon/clashapi/models/clan/ClanRanking.kt
@@ -6,8 +6,8 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class ClanRanking(
-    val clanLevel: Int = 0,
     val clanPoints: Int = 0,
+    val clanLevel: Int = 0,
     val location: Location? = null,
     val members: Int = 0,
     val tag: String? = null,
diff --git a/src/main/java/com/lycoon/clashapi/models/clan/ClanRankingList.kt b/src/main/java/com/lycoon/clashapi/models/clan/ClanRankingList.kt
deleted file mode 100644
index 4bc9e73..0000000
--- a/src/main/java/com/lycoon/clashapi/models/clan/ClanRankingList.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.lycoon.clashapi.models.clan
-
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class ClanRankingList(val items: List<ClanRanking>)
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/clan/ClanVersusRanking.kt b/src/main/java/com/lycoon/clashapi/models/clan/ClanVersusRanking.kt
index 0d7cc80..526d555 100644
--- a/src/main/java/com/lycoon/clashapi/models/clan/ClanVersusRanking.kt
+++ b/src/main/java/com/lycoon/clashapi/models/clan/ClanVersusRanking.kt
@@ -3,4 +3,8 @@ package com.lycoon.clashapi.models.clan
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class ClanVersusRanking(val clanVersusPoints: Int = 0, val clanPoints: Int = 0)
\ No newline at end of file
+data class ClanVersusRanking(
+    val clanPoints: Int = 0,
+    val clanBuilderBasePoints: Int = 0,
+    val clanVersusPoints: Int = 0
+)
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/clan/ClanVersusRankingList.kt b/src/main/java/com/lycoon/clashapi/models/clan/ClanVersusRankingList.kt
deleted file mode 100644
index f809f81..0000000
--- a/src/main/java/com/lycoon/clashapi/models/clan/ClanVersusRankingList.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.lycoon.clashapi.models.clan
-
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class ClanVersusRankingList(val items: List<ClanVersusRanking>)
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/common/BadgeUrls.kt b/src/main/java/com/lycoon/clashapi/models/common/BadgeUrls.kt
index eb2be2d..1db198d 100644
--- a/src/main/java/com/lycoon/clashapi/models/common/BadgeUrls.kt
+++ b/src/main/java/com/lycoon/clashapi/models/common/BadgeUrls.kt
@@ -3,4 +3,8 @@ package com.lycoon.clashapi.models.common
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class BadgeUrls(val small: String? = null, val medium: String? = null, val large: String? = null)
\ No newline at end of file
+data class BadgeUrls(
+    val small: String? = null,
+    val medium: String? = null,
+    val large: String? = null
+)
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/common/Label.kt b/src/main/java/com/lycoon/clashapi/models/common/Label.kt
index cb385d8..c338e01 100644
--- a/src/main/java/com/lycoon/clashapi/models/common/Label.kt
+++ b/src/main/java/com/lycoon/clashapi/models/common/Label.kt
@@ -3,4 +3,8 @@ package com.lycoon.clashapi.models.common
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class Label(val name: String? = null, val id: Int = 0, val iconUrls: IconUrls? = null)
\ No newline at end of file
+data class Label(
+    val name: String? = null,
+    val id: Int = 0,
+    val iconUrls: IconUrls? = null
+)
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/common/LabelList.kt b/src/main/java/com/lycoon/clashapi/models/common/LabelList.kt
deleted file mode 100644
index b1c280f..0000000
--- a/src/main/java/com/lycoon/clashapi/models/common/LabelList.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.lycoon.clashapi.models.common
-
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class LabelList(val items: List<Label>)
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/common/Language.kt b/src/main/java/com/lycoon/clashapi/models/common/Language.kt
index c7a1a07..f90ccc5 100644
--- a/src/main/java/com/lycoon/clashapi/models/common/Language.kt
+++ b/src/main/java/com/lycoon/clashapi/models/common/Language.kt
@@ -3,4 +3,8 @@ package com.lycoon.clashapi.models.common
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class Language(val name: String? = null, val id: Int = 0, val languageCode: String? = null)
\ No newline at end of file
+data class Language(
+    val name: String? = null,
+    val id: Int = 0,
+    val languageCode: String? = null
+)
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/common/LocationList.kt b/src/main/java/com/lycoon/clashapi/models/common/LocationList.kt
deleted file mode 100644
index 86173d9..0000000
--- a/src/main/java/com/lycoon/clashapi/models/common/LocationList.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.lycoon.clashapi.models.common
-
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class LocationList(val items: List<Location>)
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/common/TokenResponse.kt b/src/main/java/com/lycoon/clashapi/models/common/TokenResponse.kt
index bcf75ab..48a3adc 100644
--- a/src/main/java/com/lycoon/clashapi/models/common/TokenResponse.kt
+++ b/src/main/java/com/lycoon/clashapi/models/common/TokenResponse.kt
@@ -3,4 +3,8 @@ package com.lycoon.clashapi.models.common
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class TokenResponse(val tag: String, val token: String, val status: String)
+data class TokenResponse(
+    val tag: String,
+    val token: String,
+    val status: String
+)
diff --git a/src/main/java/com/lycoon/clashapi/models/league/LeagueList.kt b/src/main/java/com/lycoon/clashapi/models/league/BuilderBaseLeague.kt
similarity index 54%
rename from src/main/java/com/lycoon/clashapi/models/league/LeagueList.kt
rename to src/main/java/com/lycoon/clashapi/models/league/BuilderBaseLeague.kt
index 006514f..5837523 100644
--- a/src/main/java/com/lycoon/clashapi/models/league/LeagueList.kt
+++ b/src/main/java/com/lycoon/clashapi/models/league/BuilderBaseLeague.kt
@@ -1,6 +1,9 @@
-package com.lycoon.clashapi.models.league
-
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class LeagueList(val items: List<League>)
\ No newline at end of file
+package com.lycoon.clashapi.models.league
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class BuilderBaseLeague(
+    val name: String? = null,
+    val id: Int? = 0
+)
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/league/League.kt b/src/main/java/com/lycoon/clashapi/models/league/League.kt
index 112d6f8..62eb23a 100644
--- a/src/main/java/com/lycoon/clashapi/models/league/League.kt
+++ b/src/main/java/com/lycoon/clashapi/models/league/League.kt
@@ -4,4 +4,8 @@ import com.lycoon.clashapi.models.common.IconUrls
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class League(val name: String? = null, val id: Int = 0, val iconUrls: IconUrls? = null)
\ No newline at end of file
+data class League(
+    val name: String? = null,
+    val id: Int = 0,
+    val iconUrls: IconUrls? = null
+)
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/league/LeagueSeasonList.kt b/src/main/java/com/lycoon/clashapi/models/league/LeagueSeasonList.kt
deleted file mode 100644
index ea00a44..0000000
--- a/src/main/java/com/lycoon/clashapi/models/league/LeagueSeasonList.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.lycoon.clashapi.models.league
-
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class LeagueSeasonList(val items: List<LeagueSeason>)
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/league/LegendSeasonResult.kt b/src/main/java/com/lycoon/clashapi/models/league/LegendSeasonResult.kt
index 99c2e46..f21c5d7 100644
--- a/src/main/java/com/lycoon/clashapi/models/league/LegendSeasonResult.kt
+++ b/src/main/java/com/lycoon/clashapi/models/league/LegendSeasonResult.kt
@@ -3,4 +3,8 @@ package com.lycoon.clashapi.models.league
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class LegendSeasonResult(val trophies: Int = 0, val id: String? = null, val rank: Int = 0)
\ No newline at end of file
+data class LegendSeasonResult(
+    val trophies: Int = 0,
+    val id: String? = null,
+    val rank: Int = 0
+)
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/player/Achievement.kt b/src/main/java/com/lycoon/clashapi/models/player/Achievement.kt
index 99ee4d7..5dc5f27 100644
--- a/src/main/java/com/lycoon/clashapi/models/player/Achievement.kt
+++ b/src/main/java/com/lycoon/clashapi/models/player/Achievement.kt
@@ -10,5 +10,5 @@ data class Achievement(
     val target: Int = 0,
     val info: String? = null,
     val completionInfo: String? = null,
-    val village: String? = null
+    val village: Player.VillageType
 )
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/player/Player.kt b/src/main/java/com/lycoon/clashapi/models/player/Player.kt
index 9d28b7b..437b849 100644
--- a/src/main/java/com/lycoon/clashapi/models/player/Player.kt
+++ b/src/main/java/com/lycoon/clashapi/models/player/Player.kt
@@ -1,17 +1,21 @@
 package com.lycoon.clashapi.models.player
 
 import com.lycoon.clashapi.models.common.Label
+import com.lycoon.clashapi.models.league.BuilderBaseLeague
 import com.lycoon.clashapi.models.league.League
 import kotlinx.serialization.Serializable
 
 @Serializable
 data class Player(
-    val clan: PlayerClan? = null,
     val league: League? = null,
-    val role: String? = null,
-    var warPreference: String? = null,
+    val builderBaseLeague: BuilderBaseLeague? = null,
+    val clan: PlayerClan? = null,
+    val role: Role,
+    val warPreference: WarPreference,
     val attackWins: Int = 0,
     val defenseWins: Int = 0,
+    val versusTrophies: Int = 0,
+    val bestVersusTrophies: Int = 0,
     val townHallLevel: Int = 0,
     val townHallWeaponLevel: Int = 0,
     val versusBattleWins: Int = 0,
@@ -28,9 +32,14 @@ data class Player(
     val donations: Int = 0,
     val donationsReceived: Int = 0,
     val builderHallLevel: Int = 0,
-    val versusTrophies: Int = 0,
-    val bestVersusTrophies: Int = 0,
+    val builderBaseTrophies: Int = 0,
+    val bestBuilderBaseTrophies: Int = 0,
     val warStars: Int = 0,
+    val clanCapitalContributions: Int? = 0,
     val achievements: List<Achievement>,
-    val versusBattleWinCount: Int = 0
-)
\ No newline at end of file
+    val playerHouse: PlayerHouse
+) {
+    enum class Role { NOT_MEMBER, MEMBER, LEADER, ADMIN, COLEADER }
+    enum class WarPreference { OUT, IN }
+    enum class VillageType { HOME_VILLAGE, BUILDER_BASE, CLAN_CAPITAL }
+}
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/player/PlayerClan.kt b/src/main/java/com/lycoon/clashapi/models/player/PlayerClan.kt
index 803e279..2bcb898 100644
--- a/src/main/java/com/lycoon/clashapi/models/player/PlayerClan.kt
+++ b/src/main/java/com/lycoon/clashapi/models/player/PlayerClan.kt
@@ -4,4 +4,9 @@ import com.lycoon.clashapi.models.common.BadgeUrls
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class PlayerClan(val tag: String? = null, val clanLevel: Int = 0, val name: String? = null, val badgeUrls: BadgeUrls? = null)
\ No newline at end of file
+data class PlayerClan(
+    val tag: String? = null,
+    val clanLevel: Int = 0,
+    val name: String? = null,
+    val badgeUrls: BadgeUrls? = null
+)
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/player/PlayerRankingList.kt b/src/main/java/com/lycoon/clashapi/models/player/PlayerHouse.kt
similarity index 59%
rename from src/main/java/com/lycoon/clashapi/models/player/PlayerRankingList.kt
rename to src/main/java/com/lycoon/clashapi/models/player/PlayerHouse.kt
index 4d19621..ca642cc 100644
--- a/src/main/java/com/lycoon/clashapi/models/player/PlayerRankingList.kt
+++ b/src/main/java/com/lycoon/clashapi/models/player/PlayerHouse.kt
@@ -1,6 +1,8 @@
-package com.lycoon.clashapi.models.player
-
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class PlayerRankingList(val items: List<PlayerRanking>)
\ No newline at end of file
+package com.lycoon.clashapi.models.player
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class PlayerHouse(
+    val elements: List<PlayerHouseElement>
+)
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/player/PlayerHouseElement.kt b/src/main/java/com/lycoon/clashapi/models/player/PlayerHouseElement.kt
new file mode 100644
index 0000000..cde592c
--- /dev/null
+++ b/src/main/java/com/lycoon/clashapi/models/player/PlayerHouseElement.kt
@@ -0,0 +1,11 @@
+package com.lycoon.clashapi.models.player
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class PlayerHouseElement(
+    val id: Int? = 0,
+    val type: Type
+) {
+    enum class Type{ GROUND, ROOF, FOOT, DECO }
+}
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/player/PlayerLegendStatistics.kt b/src/main/java/com/lycoon/clashapi/models/player/PlayerLegendStatistics.kt
index c14e202..4eda9f9 100644
--- a/src/main/java/com/lycoon/clashapi/models/player/PlayerLegendStatistics.kt
+++ b/src/main/java/com/lycoon/clashapi/models/player/PlayerLegendStatistics.kt
@@ -5,10 +5,12 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class PlayerLegendStatistics(
-    val currentSeason: LegendSeasonResult? = null,
+    val previousBuilderBaseSeason: LegendSeasonResult? = null,
     val previousVersusSeason: LegendSeasonResult? = null,
-    val bestVersusSeason: LegendSeasonResult? = null,
+    val bestBuilderBaseSeason: LegendSeasonResult? = null,
+    val currentSeason: LegendSeasonResult? = null,
     val legendTrophies: Int = 0,
     val previousSeason: LegendSeasonResult? = null,
+    val bestVersusSeason: LegendSeasonResult? = null,
     val bestSeason: LegendSeasonResult? = null
 )
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/player/PlayerRanking.kt b/src/main/java/com/lycoon/clashapi/models/player/PlayerRanking.kt
index 53bd4dc..448d3a4 100644
--- a/src/main/java/com/lycoon/clashapi/models/player/PlayerRanking.kt
+++ b/src/main/java/com/lycoon/clashapi/models/player/PlayerRanking.kt
@@ -5,8 +5,8 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class PlayerRanking(
-    val clan: PlayerRankingClan? = null,
     val league: League? = null,
+    val clan: PlayerRankingClan? = null,
     val attackWins: Int = 0,
     val defenseWins: Int = 0,
     val tag: String? = null,
diff --git a/src/main/java/com/lycoon/clashapi/models/player/PlayerRankingClan.kt b/src/main/java/com/lycoon/clashapi/models/player/PlayerRankingClan.kt
index 3530c8e..238fd79 100644
--- a/src/main/java/com/lycoon/clashapi/models/player/PlayerRankingClan.kt
+++ b/src/main/java/com/lycoon/clashapi/models/player/PlayerRankingClan.kt
@@ -4,4 +4,8 @@ import com.lycoon.clashapi.models.common.BadgeUrls
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class PlayerRankingClan(val tag: String? = null, val name: String? = null, val badgeUrls: BadgeUrls? = null)
\ No newline at end of file
+data class PlayerRankingClan(
+    val tag: String? = null,
+    val name: String? = null,
+    val badgeUrls: BadgeUrls? = null
+)
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/player/PlayerVersusRanking.kt b/src/main/java/com/lycoon/clashapi/models/player/PlayerVersusRanking.kt
index 2772220..309b0e8 100644
--- a/src/main/java/com/lycoon/clashapi/models/player/PlayerVersusRanking.kt
+++ b/src/main/java/com/lycoon/clashapi/models/player/PlayerVersusRanking.kt
@@ -5,11 +5,12 @@ import kotlinx.serialization.Serializable
 @Serializable
 data class PlayerVersusRanking(
     val clan: PlayerRankingClan? = null,
+    val versusTrophies: Int = 0,
     val versusBattleWins: Int = 0,
     val tag: String? = null,
     val name: String? = null,
     val expLevel: Int = 0,
     val rank: Int = 0,
     val previousRank: Int = 0,
-    val versusTrophies: Int = 0
+    val builderBaseTrophies: Int = 0
 )
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/player/PlayerVersusRankingList.kt b/src/main/java/com/lycoon/clashapi/models/player/PlayerVersusRankingList.kt
deleted file mode 100644
index 31ce3fb..0000000
--- a/src/main/java/com/lycoon/clashapi/models/player/PlayerVersusRankingList.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.lycoon.clashapi.models.player
-
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class PlayerVersusRankingList(val items: List<PlayerVersusRanking>)
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/player/Troop.kt b/src/main/java/com/lycoon/clashapi/models/player/Troop.kt
index 96d4b60..1e679d8 100644
--- a/src/main/java/com/lycoon/clashapi/models/player/Troop.kt
+++ b/src/main/java/com/lycoon/clashapi/models/player/Troop.kt
@@ -5,9 +5,11 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class Troop(
-    val name: String? = null,
     val level: Int = 0,
+    val name: String? = null,
     val maxLevel: Int = 0,
-    val village: String? = null,
-    @SerialName("superTroopIsActive") val isSuperTroopActive: Boolean? = false
+    val village: Player.VillageType,
+
+    @SerialName("superTroopIsActive")
+    val isSuperTroopActive: Boolean? = false
 )
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/war/War.kt b/src/main/java/com/lycoon/clashapi/models/war/War.kt
index 2ae34e1..62a74c2 100644
--- a/src/main/java/com/lycoon/clashapi/models/war/War.kt
+++ b/src/main/java/com/lycoon/clashapi/models/war/War.kt
@@ -9,7 +9,13 @@ data class War(
     val attacksPerMember: Int = 0, // if from a warleague round war
     val opponent: WarClan? = null, // if warTag from warleague is #0 (not found)
     val startTime: String? = null, // if warTag from warleague is #0 (not found)
-    val state: String? = null,
+    val state: State,
     val endTime: String? = null, // if warTag from warleague is #0 (not found)
     val preparationStartTime: String? = null // if warTag from warleague is #0 (not found)
-)
\ No newline at end of file
+) {
+    enum class State {
+        CLAN_NOT_FOUND, ACCESS_DENIED, NOT_IN_WAR,
+        IN_MATCHMAKING, ENTER_WAR, MATCHED, PREPARATION,
+        WAR, IN_WAR, ENDED
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/war/WarMember.kt b/src/main/java/com/lycoon/clashapi/models/war/WarMember.kt
index 783213a..f418446 100644
--- a/src/main/java/com/lycoon/clashapi/models/war/WarMember.kt
+++ b/src/main/java/com/lycoon/clashapi/models/war/WarMember.kt
@@ -8,7 +8,7 @@ data class WarMember(
     val name: String? = null,
     val mapPosition: Int = 0,
     val townhallLevel: Int = 0,
-    val opponentAttack: Int = 0,
+    val opponentAttacks: Int = 0,
     val bestOpponentAttack: WarAttack? = null,
     val attacks: List<WarAttack>?
 )
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/war/WarlogClan.kt b/src/main/java/com/lycoon/clashapi/models/war/WarlogClan.kt
index 0326ae6..88f57d0 100644
--- a/src/main/java/com/lycoon/clashapi/models/war/WarlogClan.kt
+++ b/src/main/java/com/lycoon/clashapi/models/war/WarlogClan.kt
@@ -12,5 +12,6 @@ data class WarlogClan(
     val clanLevel: Int = 0,
     val attacks: Int = 0, // if warleague result or opponent in warlog clan
     val stars: Int = 0,
-    val expEarned: Int = 0 // if warleague result or opponent in warlog clan
+    val expEarned: Int = 0, // if warleague result or opponent in warlog clan
+    val members: List<WarMember>
 )
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/war/WarlogEntry.kt b/src/main/java/com/lycoon/clashapi/models/war/WarlogEntry.kt
index 1e515db..36c6f9d 100644
--- a/src/main/java/com/lycoon/clashapi/models/war/WarlogEntry.kt
+++ b/src/main/java/com/lycoon/clashapi/models/war/WarlogEntry.kt
@@ -6,7 +6,10 @@ import kotlinx.serialization.Serializable
 data class WarlogEntry(
     val clan: WarlogClan? = null,
     val teamSize: Int = 0,
+    val attacksPerMember: Int? = 0,
     val opponent: WarlogClan? = null,
     val endTime: String? = null,
-    val result: String? = null
-)
\ No newline at end of file
+    val result: Result
+) {
+    enum class Result { LOSE, WIN, TIE }
+}
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/warleague/WarLeague.kt b/src/main/java/com/lycoon/clashapi/models/warleague/WarLeague.kt
index e36d95b..0ec99c7 100644
--- a/src/main/java/com/lycoon/clashapi/models/warleague/WarLeague.kt
+++ b/src/main/java/com/lycoon/clashapi/models/warleague/WarLeague.kt
@@ -3,4 +3,7 @@ package com.lycoon.clashapi.models.warleague
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class WarLeague(val name: String? = null, val id: Int = 0)
\ No newline at end of file
+data class WarLeague(
+    val name: String? = null,
+    val id: Int = 0
+)
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/warleague/WarLeagueGroup.kt b/src/main/java/com/lycoon/clashapi/models/warleague/WarLeagueGroup.kt
index 065d8e1..3b6424b 100644
--- a/src/main/java/com/lycoon/clashapi/models/warleague/WarLeagueGroup.kt
+++ b/src/main/java/com/lycoon/clashapi/models/warleague/WarLeagueGroup.kt
@@ -5,8 +5,10 @@ import kotlinx.serialization.Serializable
 @Serializable
 data class WarLeagueGroup(
     val tag: String? = null, // always null?
-    val state: String? = null,
+    val state: State? = null,
     val season: String? = null,
     val clans: List<WarLeagueClan>,
     val rounds: List<WarLeagueRound>
-)
\ No newline at end of file
+) {
+    enum class State {GROUP_NOT_FOUND, NOT_IN_WAR, PREPARATION, WAR, ENDED}
+}
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/warleague/WarLeagueList.kt b/src/main/java/com/lycoon/clashapi/models/warleague/WarLeagueList.kt
deleted file mode 100644
index c7e4e37..0000000
--- a/src/main/java/com/lycoon/clashapi/models/warleague/WarLeagueList.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.lycoon.clashapi.models.warleague
-
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class WarLeagueList(val items: List<WarLeague>)
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/warleague/WarLeagueMember.kt b/src/main/java/com/lycoon/clashapi/models/warleague/WarLeagueMember.kt
index 56c77c1..10f8d02 100644
--- a/src/main/java/com/lycoon/clashapi/models/warleague/WarLeagueMember.kt
+++ b/src/main/java/com/lycoon/clashapi/models/warleague/WarLeagueMember.kt
@@ -3,4 +3,8 @@ package com.lycoon.clashapi.models.warleague
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class WarLeagueMember(val tag: String? = null, val townHallLevel: Int = 0, val name: String? = null)
\ No newline at end of file
+data class WarLeagueMember(
+    val tag: String? = null,
+    val townHallLevel: Int = 0,
+    val name: String? = null
+)
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/warleague/WarLeagueRound.kt b/src/main/java/com/lycoon/clashapi/models/warleague/WarLeagueRound.kt
index 061d2d1..6f57b9c 100644
--- a/src/main/java/com/lycoon/clashapi/models/warleague/WarLeagueRound.kt
+++ b/src/main/java/com/lycoon/clashapi/models/warleague/WarLeagueRound.kt
@@ -3,4 +3,6 @@ package com.lycoon.clashapi.models.warleague
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class WarLeagueRound(val warTags: List<String>)
\ No newline at end of file
+data class WarLeagueRound(
+    val warTags: List<String>
+)
\ No newline at end of file
diff --git a/src/test/java/ClashAPITest.kt b/src/test/java/ClashAPITest.kt
index 7fa4bbb..ac57ac6 100644
--- a/src/test/java/ClashAPITest.kt
+++ b/src/test/java/ClashAPITest.kt
@@ -1,8 +1,17 @@
 import junit.framework.TestCase
 import com.lycoon.clashapi.core.ClashAPI
+import com.lycoon.clashapi.core.CoreUtils
 import java.io.FileInputStream
 import java.io.IOException
 import com.lycoon.clashapi.core.exception.NotFoundException
+import kotlinx.serialization.*
+import kotlinx.serialization.descriptors.PrimitiveKind
+import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.descriptors.buildClassSerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.encoding.decodeStructure
 import java.util.*
 
 const val CLAN_TAG = "UPCU2098"
@@ -19,7 +28,23 @@ class ClashAPITest(playerTestMethod: String?) : TestCase(playerTestMethod) {
             tokens.load(FileInputStream(CONFIG))
         } catch (ignored: IOException) {
         }
-        clashAPI = ClashAPI(tokens.getProperty("clash-of-clans"))
+        //clashAPI = ClashAPI(tokens.getProperty("clash-of-clans"))
+        clashAPI = ClashAPI("");
+    }
+
+    @Serializable
+    data class TestSerialize(
+        val result: TestEnum,
+        val teamSize: Int = 0,
+    )
+    {
+        enum class TestEnum {LOSE, WIN, TIE}
+    }
+
+    fun testDebug() {
+        val json = "{ \"result\": \"TIE\", \"teamSize\": 5 }"
+        val deserialized = CoreUtils.json.decodeFromString<TestSerialize>(json);
+        println(deserialized);
     }
 
     fun testWarlog() {

From 33b3bf31b41221c2498021d53740a2ef2eac507f Mon Sep 17 00:00:00 2001
From: Lycoon <hugo.bois@hotmail.fr>
Date: Mon, 20 Nov 2023 17:35:39 +0100
Subject: [PATCH 2/7] feat: working on query parameters

---
 .../clashapi/core/QueryParametersBuilder.kt   | 35 ++++++++++---------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/lycoon/clashapi/core/QueryParametersBuilder.kt b/src/main/java/com/lycoon/clashapi/core/QueryParametersBuilder.kt
index d0cfab8..71bc499 100644
--- a/src/main/java/com/lycoon/clashapi/core/QueryParametersBuilder.kt
+++ b/src/main/java/com/lycoon/clashapi/core/QueryParametersBuilder.kt
@@ -1,21 +1,22 @@
 package com.lycoon.clashapi.core
 
-abstract class QueryBuilder()
-{
-    fun build() {}
+data class BaseQuery(
+    val limit: Int = 0,
+    val after: String? = null,
+    val before: String? = null,
+)
 
-    private fun setLimit(limit: Int) { this.limit = limit; }
-    private fun setAfter(after: String) { this.after = after; }
-    private fun setBefore(before: String) { this.before = before; }
+data class ClanQuery(
+    val limit: Int = 0,
+    val after: String? = null,
+    val before: String? = null,
 
-    protected var limit: Int = 0;
-    protected var after: String = "";
-    protected var before: String = "";
-}
-
-abstract class WarlogQueryBuilder(): QueryBuilder()
-{
-    abstract fun setLimit(limit: Int);
-    fun setAfter(after: String) { this.after = after; }
-    fun setBefore(before: String) { this.before = before; }
-}
+    val name: String? = null,
+    val warFrequency: String? = null,
+    val locationId: Int = 0,
+    val minMembers: Int = 0,
+    val maxMembers: Int = 0,
+    val minClanPoints: Int = 0,
+    val minClanLevel: Int = 0,
+    val labelIds: String? = null
+)
\ No newline at end of file

From 71250a4142231b895729ae3e3b70956f7a5b30fc Mon Sep 17 00:00:00 2001
From: Lycoon <hugo.bois@hotmail.fr>
Date: Tue, 21 Nov 2023 17:23:17 +0100
Subject: [PATCH 3/7] feat: working query parameters builder and fixing API
 models

---
 .../java/com/lycoon/clashapi/core/ClashAPI.kt | 315 ++++++++++++++----
 .../com/lycoon/clashapi/core/CoreUtils.kt     |  20 +-
 .../com/lycoon/clashapi/core/QueryBuilder.kt  |  60 ++++
 .../clashapi/core/QueryParametersBuilder.kt   |  22 --
 .../models/capital/CapitalDistrict.kt         |  11 +
 .../clashapi/models/capital/CapitalRanking.kt |   9 +
 .../clashapi/models/capital/ClanCapital.kt    |  10 +
 .../com/lycoon/clashapi/models/clan/Clan.kt   |  62 ++--
 ...usRanking.kt => ClanBuilderBaseRanking.kt} |  18 +-
 .../lycoon/clashapi/models/clan/ClanMember.kt |   4 +-
 .../clashapi/models/clan/enums/InviteType.kt  |  12 +
 .../models/clan/enums/WarFrequency.kt         |  15 +
 .../clashapi/models/common/GoldPassSeason.kt  |   9 +
 .../clashapi/models/league/CapitalLeague.kt   |   9 +
 .../clashapi/models/player/Achievement.kt     |  18 +-
 .../lycoon/clashapi/models/player/Player.kt   |  62 ++--
 ...Ranking.kt => PlayerBuilderBaseRanking.kt} |  31 +-
 .../clashapi/models/player/PlayerClan.kt      |   9 +-
 .../clashapi/models/player/PlayerHouse.kt     |   3 +-
 .../models/player/PlayerLegendStatistics.kt   |   9 +-
 .../lycoon/clashapi/models/player/Troop.kt    |  12 +-
 .../clashapi/models/player/enums/Role.kt      |  14 +
 .../clashapi/models/player/enums/Village.kt   |  12 +
 .../models/player/enums/WarPreference.kt      |  11 +
 src/test/java/ClashAPITest.kt                 |  44 +--
 25 files changed, 592 insertions(+), 209 deletions(-)
 create mode 100644 src/main/java/com/lycoon/clashapi/core/QueryBuilder.kt
 delete mode 100644 src/main/java/com/lycoon/clashapi/core/QueryParametersBuilder.kt
 create mode 100644 src/main/java/com/lycoon/clashapi/models/capital/CapitalDistrict.kt
 create mode 100644 src/main/java/com/lycoon/clashapi/models/capital/CapitalRanking.kt
 create mode 100644 src/main/java/com/lycoon/clashapi/models/capital/ClanCapital.kt
 rename src/main/java/com/lycoon/clashapi/models/clan/{ClanVersusRanking.kt => ClanBuilderBaseRanking.kt} (83%)
 create mode 100644 src/main/java/com/lycoon/clashapi/models/clan/enums/InviteType.kt
 create mode 100644 src/main/java/com/lycoon/clashapi/models/clan/enums/WarFrequency.kt
 create mode 100644 src/main/java/com/lycoon/clashapi/models/common/GoldPassSeason.kt
 create mode 100644 src/main/java/com/lycoon/clashapi/models/league/CapitalLeague.kt
 rename src/main/java/com/lycoon/clashapi/models/player/{PlayerVersusRanking.kt => PlayerBuilderBaseRanking.kt} (89%)
 create mode 100644 src/main/java/com/lycoon/clashapi/models/player/enums/Role.kt
 create mode 100644 src/main/java/com/lycoon/clashapi/models/player/enums/Village.kt
 create mode 100644 src/main/java/com/lycoon/clashapi/models/player/enums/WarPreference.kt

diff --git a/src/main/java/com/lycoon/clashapi/core/ClashAPI.kt b/src/main/java/com/lycoon/clashapi/core/ClashAPI.kt
index 5672d63..6094bc2 100644
--- a/src/main/java/com/lycoon/clashapi/core/ClashAPI.kt
+++ b/src/main/java/com/lycoon/clashapi/core/ClashAPI.kt
@@ -3,10 +3,14 @@ package com.lycoon.clashapi.core
 import com.lycoon.clashapi.core.CoreUtils.deserialize
 import com.lycoon.clashapi.core.CoreUtils.formatTag
 import com.lycoon.clashapi.core.CoreUtils.checkResponse
+import com.lycoon.clashapi.core.CoreUtils.unwrapList
 import com.lycoon.clashapi.core.exception.ClashAPIException
 import com.lycoon.clashapi.models.capital.CapitalRaidSeason
+import com.lycoon.clashapi.models.capital.CapitalRanking
 import com.lycoon.clashapi.models.clan.*
 import com.lycoon.clashapi.models.common.*
+import com.lycoon.clashapi.models.league.BuilderBaseLeague
+import com.lycoon.clashapi.models.league.CapitalLeague
 import com.lycoon.clashapi.models.league.League
 import com.lycoon.clashapi.models.league.LeagueSeason
 import com.lycoon.clashapi.models.player.*
@@ -25,31 +29,43 @@ import java.io.IOException
  *
  * Are you lost? Check the [README](https://github.com/Lycoon/clash-api) to see what ClashAPI is all about.
  */
-class ClashAPI(private val token: String) {
+class ClashAPI(private val token: String)
+{
     private val http: OkHttpClient = OkHttpClient()
-    private fun getBaseRequest(suffix: String): Request.Builder {
+
+    private fun getBaseRequest(suffix: String, queryParamsBuilder: QueryParamsBuilder? = null): Request.Builder
+    {
+        val query = queryParamsBuilder?.build() ?: ""
         return Request.Builder()
                 .header("authorization", "Bearer $token")
-                .url(CoreUtils.URL + CoreUtils.API_VERSION + suffix)
+                .url(CoreUtils.URL + CoreUtils.API_VERSION + suffix + query)
     }
 
     @Throws(IOException::class, ClashAPIException::class)
-    private fun get(url: String): Response {
-        val res = http.newCall(getBaseRequest(url).build()).execute()
+    private fun get(url: String, queryParamsBuilder: QueryParamsBuilder? = null): Response
+    {
+        val req = getBaseRequest(url, queryParamsBuilder).build()
+        val res = http.newCall(req).execute()
         return checkResponse(res)
     }
 
     @Throws(IOException::class, ClashAPIException::class)
-    private fun post(url: String, body: RequestBody): Response {
+    private fun post(url: String, body: RequestBody): Response
+    {
         val res = http.newCall(getBaseRequest(url).post(body).build()).execute()
         return checkResponse(res)
     }
 
-    private fun getTokenVerificationBody(token: String) : RequestBody {
+    private fun getTokenVerificationBody(token: String) : RequestBody
+    {
         val contentType: MediaType? = "application/json; charset=utf-8".toMediaTypeOrNull()
         return "{\"token\":\"$token\"}".toRequestBody(contentType)
     }
 
+    // ##############################################
+    // ||                Clans API                 ||
+    // ##############################################
+
     /**
      * Returns the warleague group in which the clan with the given tag is.
      *
@@ -90,6 +106,7 @@ class ClashAPI(private val token: String) {
      * Returns the warlog of the clan with the given tag.
      *
      * @param clanTag `String` of the clan's tag
+     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
      * @return List<WarlogEntry>
      * @see WarlogEntry
      *
@@ -97,10 +114,26 @@ class ClashAPI(private val token: String) {
      * @throws ClashAPIException if the request to the game API failed
      */
     @Throws(IOException::class, ClashAPIException::class)
-    fun getWarlog(clanTag: String): List<WarlogEntry> {
+    fun getWarlog(clanTag: String, queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<WarlogEntry> {
         val tag = formatTag(clanTag)
-        val res = get("/clans/$tag/warlog")
-        return deserialize<Warlog>(res).items
+        val res = get("/clans/$tag/warlog", queryParamsBuilder)
+        return unwrapList(deserialize(res))
+    }
+
+    /**
+     * Returns found clans from a clan search.
+     *
+     * @param queryParamsBuilder (optional) `ClanQueryBuilder` to build the query parameters
+     * @return List<Clan>
+     * @see Clan
+     *
+     * @throws IOException if the deserialization failed
+     * @throws ClashAPIException if the request to the game API failed
+     */
+    @Throws(IOException::class, ClashAPIException::class)
+    fun getClans(queryParamsBuilder: ClanQueryParamsBuilder? = null): List<Clan> {
+        val res = get("/clans", queryParamsBuilder)
+        return unwrapList(deserialize(res))
     }
 
     /**
@@ -141,6 +174,7 @@ class ClashAPI(private val token: String) {
      * Returns the members of clan attached to the tag.
      *
      * @param clanTag `String` of the clan's tag
+     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
      * @return List<ClanMember>
      * @see ClanMember
      *
@@ -148,16 +182,17 @@ class ClashAPI(private val token: String) {
      * @throws ClashAPIException if the request to the game API failed
      */
     @Throws(IOException::class, ClashAPIException::class)
-    fun getClanMembers(clanTag: String): List<ClanMember> {
+    fun getClanMembers(clanTag: String, queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<ClanMember> {
         val tag = formatTag(clanTag)
-        val res = get("/clans/$tag/members")
-        return deserialize(res)
+        val res = get("/clans/$tag/members", queryParamsBuilder)
+        return unwrapList(deserialize(res))
     }
 
     /**
      * Returns the capital raid seasons of clan attached to the tag.
      *
      * @param clanTag `String` of the clan's tag
+     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
      * @return List<CapitalRaidSeason>
      * @see CapitalRaidSeason
      *
@@ -165,12 +200,16 @@ class ClashAPI(private val token: String) {
      * @throws ClashAPIException if the request to the game API failed
      */
     @Throws(IOException::class, ClashAPIException::class)
-    fun getCapitalRaidSeasons(clanTag: String): List<CapitalRaidSeason> {
+    fun getCapitalRaidSeasons(clanTag: String, queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<CapitalRaidSeason> {
         val tag = formatTag(clanTag)
-        val res = get("/clans/$tag/capitalraidseasons")
-        return deserialize(res)
+        val res = get("/clans/$tag/capitalraidseasons", queryParamsBuilder)
+        return unwrapList(deserialize(res))
     }
 
+    // ##############################################
+    // ||                Player API                ||
+    // ##############################################
+
     /**
      * Returns the player attached to the tag.
      *
@@ -206,9 +245,30 @@ class ClashAPI(private val token: String) {
         return deserialize<TokenResponse>(res).status == "ok"
     }
 
+    // ##############################################
+    // ||               Leagues API                ||
+    // ##############################################
+
+    /**
+     * Returns all capital leagues from the game.
+     *
+     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
+     * @return List<CapitalLeague>
+     * @see CapitalLeague
+     *
+     * @throws IOException if the deserialization failed
+     * @throws ClashAPIException if the request to the game API failed
+     */
+    @Throws(IOException::class, ClashAPIException::class)
+    fun getCapitalLeagues(queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<CapitalLeague> {
+        val res = get("/capitalleagues", queryParamsBuilder)
+        return unwrapList(deserialize(res))
+    }
+
     /**
      * Returns all leagues from the game.
      *
+     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
      * @return List<League>
      * @see League
      *
@@ -216,9 +276,9 @@ class ClashAPI(private val token: String) {
      * @throws ClashAPIException if the request to the game API failed
      */
     @Throws(IOException::class, ClashAPIException::class)
-    fun getLeagues(): List<League> {
-        val res = get("/leagues")
-        return deserialize(res)
+    fun getLeagues(queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<League> {
+        val res = get("/leagues", queryParamsBuilder)
+        return unwrapList(deserialize(res))
     }
 
     /**
@@ -226,6 +286,7 @@ class ClashAPI(private val token: String) {
      *
      * @param leagueId `String` of the league id
      * @param seasonId `String` of the season id
+     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
      * @return List<PlayerRanking>
      * @see PlayerRanking
      *
@@ -233,11 +294,63 @@ class ClashAPI(private val token: String) {
      * @throws ClashAPIException if the request to the game API failed
      */
     @Throws(IOException::class, ClashAPIException::class)
-    fun getLeagueSeasonRankings(leagueId: String, seasonId: String): List<PlayerRanking> {
-        val res = get("/leagues/$leagueId/seasons/$seasonId")
+    fun getLeagueSeasonRankings(
+            leagueId: String,
+            seasonId: String,
+            queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<PlayerRanking>
+    {
+        val res = get("/leagues/$leagueId/seasons/$seasonId", queryParamsBuilder)
+        return unwrapList(deserialize(res))
+    }
+
+    /**
+     * Returns capital league information
+     *
+     * @param leagueId `String` of the league id
+     * @return CapitalLeague
+     * @see CapitalLeague
+     *
+     * @throws IOException if the deserialization failed
+     * @throws ClashAPIException if the request to the game API failed
+     */
+    @Throws(IOException::class, ClashAPIException::class)
+    fun getCapitalLeague(leagueId: String): CapitalLeague {
+        val res = get("/capitalleagues/$leagueId")
         return deserialize(res)
     }
 
+    /**
+     * Returns builder base league information
+     *
+     * @param leagueId `String` of the league id
+     * @return BuilderBaseLeague
+     * @see BuilderBaseLeague
+     *
+     * @throws IOException if the deserialization failed
+     * @throws ClashAPIException if the request to the game API failed
+     */
+    @Throws(IOException::class, ClashAPIException::class)
+    fun getBuilderBaseLeague(leagueId: String): BuilderBaseLeague {
+        val res = get("/builderbaseleagues/$leagueId")
+        return deserialize(res)
+    }
+
+    /**
+     * Returns all builder base leagues from the game.
+     *
+     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
+     * @return List<BuilderBaseLeague>
+     * @see BuilderBaseLeague
+     *
+     * @throws IOException if the deserialization failed
+     * @throws ClashAPIException if the request to the game API failed
+     */
+    @Throws(IOException::class, ClashAPIException::class)
+    fun getBuilderBaseLeagues(queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<BuilderBaseLeague> {
+        val res = get("/builderbaseleagues", queryParamsBuilder)
+        return unwrapList(deserialize(res))
+    }
+
     /**
      * Returns league information
      *
@@ -258,6 +371,7 @@ class ClashAPI(private val token: String) {
      * Returns league seasons
      *
      * @param leagueId `String` of the league id
+     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
      * @return List<LeagueSeason>
      * @see LeagueSeason
      *
@@ -265,9 +379,9 @@ class ClashAPI(private val token: String) {
      * @throws ClashAPIException if the request to the game API failed
      */
     @Throws(IOException::class, ClashAPIException::class)
-    fun getLeagueSeasons(leagueId: String): List<LeagueSeason> {
-        val res = get("/leagues/$leagueId/seasons")
-        return deserialize(res)
+    fun getLeagueSeasons(leagueId: String, queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<LeagueSeason> {
+        val res = get("/leagues/$leagueId/seasons", queryParamsBuilder)
+        return unwrapList(deserialize(res))
     }
 
     /**
@@ -289,6 +403,7 @@ class ClashAPI(private val token: String) {
     /**
      * Returns all warleagues
      *
+     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
      * @return List<WarLeague>
      * @see WarLeague
      *
@@ -296,15 +411,20 @@ class ClashAPI(private val token: String) {
      * @throws ClashAPIException if the request to the game API failed
      */
     @Throws(IOException::class, ClashAPIException::class)
-    fun getWarLeagues(): List<WarLeague> {
-        val res = get("/warleagues")
-        return deserialize(res)
+    fun getWarLeagues(queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<WarLeague> {
+        val res = get("/warleagues", queryParamsBuilder)
+        return unwrapList(deserialize(res))
     }
 
+    // ##############################################
+    // ||              Locations API               ||
+    // ##############################################
+
     /**
      * Returns clan rankings for a specific location
      *
      * @param locationId `String` of the location id
+     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
      * @return List<ClanRanking>
      * @see ClanRanking
      *
@@ -312,62 +432,102 @@ class ClashAPI(private val token: String) {
      * @throws ClashAPIException if the request to the game API failed
      */
     @Throws(IOException::class, ClashAPIException::class)
-    fun getClanRankings(locationId: String): List<ClanRanking> {
-        val res = get("/locations/${locationId}/rankings/clans")
-        return deserialize(res)
+    fun getClanRankings(locationId: String, queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<ClanRanking> {
+        val res = get("/locations/${locationId}/rankings/clans", queryParamsBuilder)
+        return unwrapList(deserialize(res))
+    }
+
+    /**
+     * Returns player rankings for a specific location
+     *
+     * @param locationId `String` of the location id
+     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
+     * @return List<PlayerRanking>
+     * @see PlayerRanking
+     *
+     * @throws IOException if the deserialization failed
+     * @throws ClashAPIException if the request to the game API failed
+     */
+    @Throws(IOException::class, ClashAPIException::class)
+    fun getPlayerRankings(locationId: String, queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<PlayerRanking> {
+        val res = get("/locations/${locationId}/rankings/players", queryParamsBuilder)
+        return unwrapList(deserialize(res))
+    }
+
+    /**
+     * Returns clan builder base rankings for a specific location
+     *
+     * @param locationId `String` of the location id
+     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
+     * @return List<ClanBuilderBaseRanking>
+     * @see ClanBuilderBaseRanking
+     *
+     * @throws IOException if the deserialization failed
+     * @throws ClashAPIException if the request to the game API failed
+     */
+    @Throws(IOException::class, ClashAPIException::class)
+    fun getClanBuilderBaseRankings(locationId: String, queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<ClanBuilderBaseRanking> {
+        val res = get("/locations/${locationId}/rankings/clans-builder-base", queryParamsBuilder)
+        return unwrapList(deserialize(res))
     }
 
     /**
      * Returns clan versus rankings for a specific location
      *
      * @param locationId `String` of the location id
-     * @return List<ClanVersusRanking>
-     * @see ClanVersusRanking
+     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
+     * @return List<ClanBuilderBaseRanking>
+     * @see ClanBuilderBaseRanking
      *
      * @throws IOException if the deserialization failed
      * @throws ClashAPIException if the request to the game API failed
      */
+    @Deprecated("Use getClanBuilderBaseRankings instead")
     @Throws(IOException::class, ClashAPIException::class)
-    fun getClanVersusRankings(locationId: String): List<ClanVersusRanking> {
-        val res = get("/locations/${locationId}/rankings/clans-versus")
-        return deserialize(res)
+    fun getClanVersusRankings(locationId: String, queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<ClanBuilderBaseRanking> {
+        val res = get("/locations/${locationId}/rankings/clans-versus", queryParamsBuilder)
+        return unwrapList(deserialize(res))
     }
 
     /**
-     * Returns player rankings for a specific location
+     * Returns player builder base rankings for a specific location
      *
      * @param locationId `String` of the location id
-     * @return List<PlayerRanking>
-     * @see PlayerRanking
+     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
+     * @return List<PlayerBuilderBaseRanking>
+     * @see PlayerBuilderBaseRanking
      *
      * @throws IOException if the deserialization failed
      * @throws ClashAPIException if the request to the game API failed
      */
     @Throws(IOException::class, ClashAPIException::class)
-    fun getPlayerRankings(locationId: String): List<PlayerRanking> {
-        val res = get("/locations/${locationId}/rankings/players")
-        return deserialize(res)
+    fun getPlayerBuilderBaseRankings(locationId: String, queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<PlayerBuilderBaseRanking> {
+        val res = get("/locations/${locationId}/rankings/players-builder-base", queryParamsBuilder)
+        return unwrapList(deserialize(res))
     }
 
     /**
      * Returns player versus rankings for a specific location
      *
      * @param locationId `String` of the location id
-     * @return List<PlayerVersusRanking>
-     * @see PlayerVersusRanking
+     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
+     * @return List<PlayerBuilderBaseRanking>
+     * @see PlayerBuilderBaseRanking
      *
      * @throws IOException if the deserialization failed
      * @throws ClashAPIException if the request to the game API failed
      */
+    @Deprecated("Use getPlayerBuilderBaseRankings instead")
     @Throws(IOException::class, ClashAPIException::class)
-    fun getPlayerVersusRankings(locationId: String): List<PlayerVersusRanking> {
-        val res = get("/locations/${locationId}/rankings/players-versus")
-        return deserialize(res)
+    fun getPlayerVersusRankings(locationId: String, queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<PlayerBuilderBaseRanking> {
+        val res = get("/locations/${locationId}/rankings/players-versus", queryParamsBuilder)
+        return unwrapList(deserialize(res))
     }
 
     /**
      * Returns locations
      *
+     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
      * @return List<Location>
      * @see Location
      *
@@ -375,13 +535,30 @@ class ClashAPI(private val token: String) {
      * @throws ClashAPIException if the request to the game API failed
      */
     @Throws(IOException::class, ClashAPIException::class)
-    fun getLocations(): List<Location> {
-        val res = get("/locations")
-        return deserialize(res)
+    fun getLocations(queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<Location> {
+        val res = get("/locations", queryParamsBuilder)
+        return unwrapList(deserialize(res))
+    }
+
+    /**
+     * Returns capital rankings for a specific location
+     *
+     * @param locationId `String` of the location id
+     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
+     * @return List<ClanCapitalRanking>
+     * @see CapitalRanking
+     *
+     * @throws IOException if the deserialization failed
+     * @throws ClashAPIException if the request to the game API failed
+     */
+    @Throws(IOException::class, ClashAPIException::class)
+    fun getCapitalRankings(locationId: String, queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<CapitalRanking> {
+        val res = get("/locations/$locationId/rankings/capitals", queryParamsBuilder)
+        return unwrapList(deserialize(res))
     }
 
     /**
-     * Returns specific location
+     * Returns specific location information
      *
      * @param locationId `String` of the location id
      * @return Location
@@ -396,9 +573,34 @@ class ClashAPI(private val token: String) {
         return deserialize(res)
     }
 
+    // ##############################################
+    // ||               GoldPass API               ||
+    // ##############################################
+
+    /**
+     * Returns gold pass information
+     *
+     * @return GoldPassSeason
+     * @see GoldPassSeason
+     *
+     * @throws IOException if the deserialization failed
+     * @throws ClashAPIException if the request to the game API failed
+     */
+    @Throws(IOException::class, ClashAPIException::class)
+    fun getGoldPass(): GoldPassSeason {
+        val res = get("/goldpass/seasons/current")
+        return deserialize(res)
+    }
+
+
+    // ##############################################
+    // ||                Labels API                ||
+    // ##############################################
+
     /**
      * Returns player labels
      *
+     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
      * @return List<Label>
      * @see Label
      *
@@ -406,14 +608,15 @@ class ClashAPI(private val token: String) {
      * @throws ClashAPIException if the request to the game API failed
      */
     @Throws(IOException::class, ClashAPIException::class)
-    fun getPlayerLabels(): List<Label> {
-        val res = get("/labels/players")
-        return deserialize(res)
+    fun getPlayerLabels(queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<Label> {
+        val res = get("/labels/players", queryParamsBuilder)
+        return unwrapList(deserialize(res))
     }
 
     /**
      * Returns clan labels
      *
+     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
      * @return List<Label>
      * @see Label
      *
@@ -421,8 +624,8 @@ class ClashAPI(private val token: String) {
      * @throws ClashAPIException if the request to the game API failed
      */
     @Throws(IOException::class, ClashAPIException::class)
-    fun getClanLabels(): List<Label> {
-        val res = get("/labels/clans")
-        return deserialize(res)
+    fun getClanLabels(queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<Label> {
+        val res = get("/labels/clans", queryParamsBuilder)
+        return unwrapList(deserialize(res))
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/core/CoreUtils.kt b/src/main/java/com/lycoon/clashapi/core/CoreUtils.kt
index 9af1822..3ee83f0 100644
--- a/src/main/java/com/lycoon/clashapi/core/CoreUtils.kt
+++ b/src/main/java/com/lycoon/clashapi/core/CoreUtils.kt
@@ -1,9 +1,9 @@
 package com.lycoon.clashapi.core
 
 import com.lycoon.clashapi.core.exception.*
+import kotlinx.serialization.Serializable
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonElement
 import okhttp3.Response
 import java.io.IOException
 
@@ -35,7 +35,23 @@ object CoreUtils {
         return json.decodeFromString(res.body?.string() ?: "")
     }
 
-    fun formatTag(tag: String): String {
+    /*
+     * There are situations where we get a list from the API, but we can't return it directly as List<T>
+     * because the API returns that list inside an object, within a single attribute named 'items' and
+     * Kotlinx Serialization doesn't support that.
+     *
+     * For the concerned routes, we unwrap the list to avoid duplicating useless single-attribute classes
+     * wrapping the list.
+     */
+    @Serializable
+    class WrapperList<T>(val items: List<T>)
+    fun <T> unwrapList(obj: WrapperList<T>): List<T> { return obj.items }
+
+    /*
+     * We don't want to invalidate a request if the provided tag doesn't start with a '#', so we prepend it
+     * if it's not present. The %23 is the URL encoded version of '#'.
+     */
+    fun formatTag(tag: String): String{
         return if (tag.startsWith("#")) tag.replace("#", "%23") else "%23$tag"
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/core/QueryBuilder.kt b/src/main/java/com/lycoon/clashapi/core/QueryBuilder.kt
new file mode 100644
index 0000000..4cac007
--- /dev/null
+++ b/src/main/java/com/lycoon/clashapi/core/QueryBuilder.kt
@@ -0,0 +1,60 @@
+package com.lycoon.clashapi.core
+
+abstract class QueryParamsBuilder(
+    open val limit: Int?     = null,
+    open val after: String?  = null,
+    open val before: String? = null,
+) {
+    open fun build(): String {
+        append(builder, "limit", limit)
+        append(builder, "after", after)
+        append(builder, "before", before)
+
+        return builder.toString()
+    }
+
+    companion object
+    {
+        fun <T> append(builder: StringBuilder, key: String, value: T)
+        {
+            if (value != null) {
+                builder.append(if (builder.isEmpty()) "?" else "&")
+                builder.append("$key=$value")
+            }
+        }
+    }
+
+    protected val builder = StringBuilder()
+}
+
+class ClanQueryParamsBuilder(
+    override val limit: Int?     = null,
+    override val after: String?  = null,
+    override val before: String? = null,
+    val name: String?           = null,
+    val warFrequency: String?   = null,
+    val locationId: Int?        = null,
+    val minMembers: Int?        = null,
+    val maxMembers: Int?        = null,
+    val minClanPoints: Int?     = null,
+    val minClanLevel: Int?      = null,
+    val labelIds: String?       = null
+) : QueryParamsBuilder(limit, after, before)
+{
+    override fun build(): String
+    {
+        append(builder, "name", name)
+        append(builder, "warFrequency", warFrequency)
+        append(builder, "locationId", locationId)
+        append(builder, "minMembers", minMembers)
+        append(builder, "maxMembers", maxMembers)
+        append(builder, "minClanPoints", minClanPoints)
+        append(builder, "minClanLevel", minClanLevel)
+        append(builder, "labelIds", labelIds)
+
+        return super.build()
+    }
+}
+
+class SimpleQueryParamsBuilder(): QueryParamsBuilder(limit = null, after = "", before = "")
+{}
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/core/QueryParametersBuilder.kt b/src/main/java/com/lycoon/clashapi/core/QueryParametersBuilder.kt
deleted file mode 100644
index 71bc499..0000000
--- a/src/main/java/com/lycoon/clashapi/core/QueryParametersBuilder.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.lycoon.clashapi.core
-
-data class BaseQuery(
-    val limit: Int = 0,
-    val after: String? = null,
-    val before: String? = null,
-)
-
-data class ClanQuery(
-    val limit: Int = 0,
-    val after: String? = null,
-    val before: String? = null,
-
-    val name: String? = null,
-    val warFrequency: String? = null,
-    val locationId: Int = 0,
-    val minMembers: Int = 0,
-    val maxMembers: Int = 0,
-    val minClanPoints: Int = 0,
-    val minClanLevel: Int = 0,
-    val labelIds: String? = null
-)
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/capital/CapitalDistrict.kt b/src/main/java/com/lycoon/clashapi/models/capital/CapitalDistrict.kt
new file mode 100644
index 0000000..28ef42f
--- /dev/null
+++ b/src/main/java/com/lycoon/clashapi/models/capital/CapitalDistrict.kt
@@ -0,0 +1,11 @@
+package com.lycoon.clashapi.models.capital
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class CapitalDistrict
+(
+    val name: String? = null,
+    val id: Int = 0,
+    val districtHallLevel: Int = 0,
+)
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/capital/CapitalRanking.kt b/src/main/java/com/lycoon/clashapi/models/capital/CapitalRanking.kt
new file mode 100644
index 0000000..c56822e
--- /dev/null
+++ b/src/main/java/com/lycoon/clashapi/models/capital/CapitalRanking.kt
@@ -0,0 +1,9 @@
+package com.lycoon.clashapi.models.capital
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class CapitalRanking (
+    val clanPoints: Int = 0,
+    val clanCapitalPoints: Int = 0
+)
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/capital/ClanCapital.kt b/src/main/java/com/lycoon/clashapi/models/capital/ClanCapital.kt
new file mode 100644
index 0000000..55e9918
--- /dev/null
+++ b/src/main/java/com/lycoon/clashapi/models/capital/ClanCapital.kt
@@ -0,0 +1,10 @@
+package com.lycoon.clashapi.models.capital
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ClanCapital
+(
+    val capitalHallLevel: Int = 0,
+    val districts: List<CapitalDistrict>,
+)
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/clan/Clan.kt b/src/main/java/com/lycoon/clashapi/models/clan/Clan.kt
index 1369473..3d96938 100644
--- a/src/main/java/com/lycoon/clashapi/models/clan/Clan.kt
+++ b/src/main/java/com/lycoon/clashapi/models/clan/Clan.kt
@@ -1,45 +1,55 @@
 package com.lycoon.clashapi.models.clan
 
+import com.lycoon.clashapi.models.capital.ClanCapital
+import com.lycoon.clashapi.models.clan.enums.InviteType
+import com.lycoon.clashapi.models.clan.enums.WarFrequency
 import com.lycoon.clashapi.models.common.BadgeUrls
 import com.lycoon.clashapi.models.common.Label
 import com.lycoon.clashapi.models.common.Language
 import com.lycoon.clashapi.models.common.Location
+import com.lycoon.clashapi.models.league.CapitalLeague
 import com.lycoon.clashapi.models.war.WarMember
 import com.lycoon.clashapi.models.warleague.WarLeague
+import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class Clan(
-    val warLeague: WarLeague? = null,
-    val memberList: List<ClanMember>,
+data class Clan
+(
+    @SerialName("type")
+    val inviteType: InviteType,
+
+    val tag: String,
+    val name: String,
+    val clanLevel: Int = 0,
+    val clanPoints: Int = 0,
+    val description: String? = null,          // nullable when using clan search
+    val isFamilyFriendly: Boolean = false,
+    val chatLanguage: Language? = null,
+    val labels: List<Label>,
+    val location: Location? = null,
+    val badgeUrls: BadgeUrls? = null,
+    val members: Int = 0,
+    val memberList: List<ClanMember>? = null, // nullable when using clan search
+
+    @Deprecated("Use requiredBuilderBaseTrophies instead")
     val requiredVersusTrophies: Int = 0,
-    val requiredTownhallLevel: Int = 0,
+    val requiredBuilderBaseTrophies: Int = 0,
     val requiredTrophies: Int = 0,
+    val requiredTownhallLevel: Int = 0,
+
+    @Deprecated("Use clanBuilderBasePoints instead")
     val clanVersusPoints: Int = 0,
-    val tag: String? = null,
+    val clanBuilderBasePoints: Int = 0,
+    val clanCapitalPoints: Int = 0,
+    val clanCapital: ClanCapital? = null,     // nullable if clan has no capital
+
+    val warLeague: WarLeague,
+    val capitalLeague: CapitalLeague,
     val isWarLogPublic: Boolean = false,
-    val warFrequency: Frequency,
-    val clanLevel: Int = 0,
+    val warFrequency: WarFrequency,
     val warWinStreak: Int = 0,
     val warWins: Int = 0,
     val warTies: Int = 0,
     val warLosses: Int = 0,
-    val clanPoints: Int = 0,
-    val chatLanguage: Language? = null,
-    val labels: List<Label>,
-    val name: String? = null,
-    val location: Location? = null,
-    val type: InviteType,
-    val members: Int = 0,
-    val description: String? = null,
-    val badgeUrls: BadgeUrls? = null
-){
-    enum class Frequency {
-        UNKNOWN, ALWAYS, MORE_THAN_ONCE_PER_WEEK,
-        ONCE_PER_WEEK, LESS_THAN_ONCE_PER_WEEK, NEVER, ANY
-    }
-
-    enum class InviteType {
-        OPEN, INVITE_ONLY, CLOSED
-    }
-}
\ No newline at end of file
+)
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/clan/ClanVersusRanking.kt b/src/main/java/com/lycoon/clashapi/models/clan/ClanBuilderBaseRanking.kt
similarity index 83%
rename from src/main/java/com/lycoon/clashapi/models/clan/ClanVersusRanking.kt
rename to src/main/java/com/lycoon/clashapi/models/clan/ClanBuilderBaseRanking.kt
index 526d555..fbbc7c8 100644
--- a/src/main/java/com/lycoon/clashapi/models/clan/ClanVersusRanking.kt
+++ b/src/main/java/com/lycoon/clashapi/models/clan/ClanBuilderBaseRanking.kt
@@ -1,10 +1,10 @@
-package com.lycoon.clashapi.models.clan
-
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class ClanVersusRanking(
-    val clanPoints: Int = 0,
-    val clanBuilderBasePoints: Int = 0,
-    val clanVersusPoints: Int = 0
+package com.lycoon.clashapi.models.clan
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ClanBuilderBaseRanking(
+    val clanPoints: Int = 0,
+    val clanBuilderBasePoints: Int = 0,
+    val clanVersusPoints: Int = 0
 )
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/clan/ClanMember.kt b/src/main/java/com/lycoon/clashapi/models/clan/ClanMember.kt
index a170302..9d3a257 100644
--- a/src/main/java/com/lycoon/clashapi/models/clan/ClanMember.kt
+++ b/src/main/java/com/lycoon/clashapi/models/clan/ClanMember.kt
@@ -1,7 +1,7 @@
 package com.lycoon.clashapi.models.clan
 
 import com.lycoon.clashapi.models.league.League
-import com.lycoon.clashapi.models.player.Player
+import com.lycoon.clashapi.models.player.enums.Role
 import kotlinx.serialization.Serializable
 
 @Serializable
@@ -9,7 +9,7 @@ data class ClanMember(
     val league: League? = null,
     val tag: String? = null,
     val name: String? = null,
-    val role: Player.Role,
+    val role: Role,
     val expLevel: Int = 0,
     val clanRank: Int = 0,
     val previousClanRank: Int = 0,
diff --git a/src/main/java/com/lycoon/clashapi/models/clan/enums/InviteType.kt b/src/main/java/com/lycoon/clashapi/models/clan/enums/InviteType.kt
new file mode 100644
index 0000000..146633f
--- /dev/null
+++ b/src/main/java/com/lycoon/clashapi/models/clan/enums/InviteType.kt
@@ -0,0 +1,12 @@
+package com.lycoon.clashapi.models.clan.enums
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+enum class InviteType
+{
+    @SerialName("open") OPEN,
+    @SerialName("inviteOnly") INVITE_ONLY,
+    @SerialName("closed") CLOSED
+}
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/clan/enums/WarFrequency.kt b/src/main/java/com/lycoon/clashapi/models/clan/enums/WarFrequency.kt
new file mode 100644
index 0000000..4554266
--- /dev/null
+++ b/src/main/java/com/lycoon/clashapi/models/clan/enums/WarFrequency.kt
@@ -0,0 +1,15 @@
+package com.lycoon.clashapi.models.clan.enums
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+enum class WarFrequency {
+    @SerialName("unknown") UNKNOWN,
+    @SerialName("always") ALWAYS,
+    @SerialName("moreThanOncePerWeek") MORE_THAN_ONCE_PER_WEEK,
+    @SerialName("oncePerWeek") ONCE_PER_WEEK,
+    @SerialName("lessThanOncePerWeek") LESS_THAN_ONCE_PER_WEEK,
+    @SerialName("never") NEVER,
+    @SerialName("any") ANY
+}
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/common/GoldPassSeason.kt b/src/main/java/com/lycoon/clashapi/models/common/GoldPassSeason.kt
new file mode 100644
index 0000000..03c80d9
--- /dev/null
+++ b/src/main/java/com/lycoon/clashapi/models/common/GoldPassSeason.kt
@@ -0,0 +1,9 @@
+package com.lycoon.clashapi.models.common
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class GoldPassSeason (
+    val startTime: String? = null,
+    val endTime: String? = null
+)
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/league/CapitalLeague.kt b/src/main/java/com/lycoon/clashapi/models/league/CapitalLeague.kt
new file mode 100644
index 0000000..bb35dc6
--- /dev/null
+++ b/src/main/java/com/lycoon/clashapi/models/league/CapitalLeague.kt
@@ -0,0 +1,9 @@
+package com.lycoon.clashapi.models.league
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class CapitalLeague(
+        val name: String? = null,
+        val id: Int? = 0
+)
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/player/Achievement.kt b/src/main/java/com/lycoon/clashapi/models/player/Achievement.kt
index 5dc5f27..38746d7 100644
--- a/src/main/java/com/lycoon/clashapi/models/player/Achievement.kt
+++ b/src/main/java/com/lycoon/clashapi/models/player/Achievement.kt
@@ -1,14 +1,16 @@
 package com.lycoon.clashapi.models.player
 
+import com.lycoon.clashapi.models.player.enums.Village
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class Achievement(
-    val stars: Int = 0,
-    val value: Int = 0,
-    val name: String? = null,
-    val target: Int = 0,
-    val info: String? = null,
-    val completionInfo: String? = null,
-    val village: Player.VillageType
+data class Achievement
+(
+    val stars: Int,
+    val value: Int,
+    val name: String,
+    val target: Int,
+    val info: String,
+    val completionInfo: String? = null, // nullable
+    val village: Village
 )
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/player/Player.kt b/src/main/java/com/lycoon/clashapi/models/player/Player.kt
index 437b849..8154f45 100644
--- a/src/main/java/com/lycoon/clashapi/models/player/Player.kt
+++ b/src/main/java/com/lycoon/clashapi/models/player/Player.kt
@@ -3,43 +3,47 @@ package com.lycoon.clashapi.models.player
 import com.lycoon.clashapi.models.common.Label
 import com.lycoon.clashapi.models.league.BuilderBaseLeague
 import com.lycoon.clashapi.models.league.League
+import com.lycoon.clashapi.models.player.enums.Role
+import com.lycoon.clashapi.models.player.enums.WarPreference
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class Player(
-    val league: League? = null,
-    val builderBaseLeague: BuilderBaseLeague? = null,
-    val clan: PlayerClan? = null,
-    val role: Role,
-    val warPreference: WarPreference,
-    val attackWins: Int = 0,
-    val defenseWins: Int = 0,
-    val versusTrophies: Int = 0,
-    val bestVersusTrophies: Int = 0,
-    val townHallLevel: Int = 0,
+data class Player
+(
+    val tag: String,
+    val name: String,
+    val playerHouse: PlayerHouse? = null,        // nullable if not in clan
+    val clan: PlayerClan? = null,                // nullable if not in clan
+    val role: Role? = null,                      // nullable if not in clan
+    val expLevel: Int = 0,
+    val trophies: Int = 0,
+    val builderHallLevel: Int = 0,
     val townHallWeaponLevel: Int = 0,
-    val versusBattleWins: Int = 0,
+    val townHallLevel: Int = 0,
+    val warPreference: WarPreference? = null,    // nullable if not in clan
+    val warStars: Int = 0,
+    val achievements: List<Achievement>,
+    val labels: List<Label>,
+    val clanCapitalContributions: Int? = 0,
+
+    val builderBaseLeague: BuilderBaseLeague? = null,
+    val league: League? = null,
     val legendStatistics: PlayerLegendStatistics? = null,
+
     val troops: List<Troop>,
     val heroes: List<Troop>,
     val spells: List<Troop>,
-    val labels: List<Label>,
-    val tag: String? = null,
-    val name: String? = null,
-    val expLevel: Int = 0,
-    val trophies: Int = 0,
+
     val bestTrophies: Int = 0,
-    val donations: Int = 0,
-    val donationsReceived: Int = 0,
-    val builderHallLevel: Int = 0,
     val builderBaseTrophies: Int = 0,
     val bestBuilderBaseTrophies: Int = 0,
-    val warStars: Int = 0,
-    val clanCapitalContributions: Int? = 0,
-    val achievements: List<Achievement>,
-    val playerHouse: PlayerHouse
-) {
-    enum class Role { NOT_MEMBER, MEMBER, LEADER, ADMIN, COLEADER }
-    enum class WarPreference { OUT, IN }
-    enum class VillageType { HOME_VILLAGE, BUILDER_BASE, CLAN_CAPITAL }
-}
\ No newline at end of file
+    val versusTrophies: Int = 0,
+    val bestVersusTrophies: Int = 0,
+
+    val attackWins: Int = 0,
+    val defenseWins: Int = 0,
+    val versusBattleWins: Int = 0,
+    val donations: Int = 0,
+    val donationsReceived: Int = 0,
+
+)
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/player/PlayerVersusRanking.kt b/src/main/java/com/lycoon/clashapi/models/player/PlayerBuilderBaseRanking.kt
similarity index 89%
rename from src/main/java/com/lycoon/clashapi/models/player/PlayerVersusRanking.kt
rename to src/main/java/com/lycoon/clashapi/models/player/PlayerBuilderBaseRanking.kt
index 309b0e8..d8c7ca0 100644
--- a/src/main/java/com/lycoon/clashapi/models/player/PlayerVersusRanking.kt
+++ b/src/main/java/com/lycoon/clashapi/models/player/PlayerBuilderBaseRanking.kt
@@ -1,16 +1,17 @@
-package com.lycoon.clashapi.models.player
-
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class PlayerVersusRanking(
-    val clan: PlayerRankingClan? = null,
-    val versusTrophies: Int = 0,
-    val versusBattleWins: Int = 0,
-    val tag: String? = null,
-    val name: String? = null,
-    val expLevel: Int = 0,
-    val rank: Int = 0,
-    val previousRank: Int = 0,
-    val builderBaseTrophies: Int = 0
+package com.lycoon.clashapi.models.player
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class PlayerBuilderBaseRanking
+(
+    val clan: PlayerRankingClan? = null,
+    val versusTrophies: Int = 0,
+    val versusBattleWins: Int = 0,
+    val tag: String? = null,
+    val name: String? = null,
+    val expLevel: Int = 0,
+    val rank: Int = 0,
+    val previousRank: Int = 0,
+    val builderBaseTrophies: Int = 0
 )
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/player/PlayerClan.kt b/src/main/java/com/lycoon/clashapi/models/player/PlayerClan.kt
index 2bcb898..2a05e6a 100644
--- a/src/main/java/com/lycoon/clashapi/models/player/PlayerClan.kt
+++ b/src/main/java/com/lycoon/clashapi/models/player/PlayerClan.kt
@@ -4,9 +4,10 @@ import com.lycoon.clashapi.models.common.BadgeUrls
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class PlayerClan(
-    val tag: String? = null,
-    val clanLevel: Int = 0,
-    val name: String? = null,
+data class PlayerClan
+(
+    val tag: String,
+    val clanLevel: Int,
+    val name: String,
     val badgeUrls: BadgeUrls? = null
 )
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/player/PlayerHouse.kt b/src/main/java/com/lycoon/clashapi/models/player/PlayerHouse.kt
index ca642cc..f19175a 100644
--- a/src/main/java/com/lycoon/clashapi/models/player/PlayerHouse.kt
+++ b/src/main/java/com/lycoon/clashapi/models/player/PlayerHouse.kt
@@ -3,6 +3,7 @@ package com.lycoon.clashapi.models.player
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class PlayerHouse(
+data class PlayerHouse
+(
     val elements: List<PlayerHouseElement>
 )
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/player/PlayerLegendStatistics.kt b/src/main/java/com/lycoon/clashapi/models/player/PlayerLegendStatistics.kt
index 4eda9f9..87bc3ef 100644
--- a/src/main/java/com/lycoon/clashapi/models/player/PlayerLegendStatistics.kt
+++ b/src/main/java/com/lycoon/clashapi/models/player/PlayerLegendStatistics.kt
@@ -4,13 +4,14 @@ import com.lycoon.clashapi.models.league.LegendSeasonResult
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class PlayerLegendStatistics(
+data class PlayerLegendStatistics
+(
+    val legendTrophies: Int = 0,
+    val previousSeason: LegendSeasonResult? = null,
     val previousBuilderBaseSeason: LegendSeasonResult? = null,
     val previousVersusSeason: LegendSeasonResult? = null,
     val bestBuilderBaseSeason: LegendSeasonResult? = null,
-    val currentSeason: LegendSeasonResult? = null,
-    val legendTrophies: Int = 0,
-    val previousSeason: LegendSeasonResult? = null,
     val bestVersusSeason: LegendSeasonResult? = null,
+    val currentSeason: LegendSeasonResult? = null,
     val bestSeason: LegendSeasonResult? = null
 )
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/player/Troop.kt b/src/main/java/com/lycoon/clashapi/models/player/Troop.kt
index 1e679d8..d11cf76 100644
--- a/src/main/java/com/lycoon/clashapi/models/player/Troop.kt
+++ b/src/main/java/com/lycoon/clashapi/models/player/Troop.kt
@@ -1,14 +1,16 @@
 package com.lycoon.clashapi.models.player
 
+import com.lycoon.clashapi.models.player.enums.Village
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class Troop(
-    val level: Int = 0,
-    val name: String? = null,
-    val maxLevel: Int = 0,
-    val village: Player.VillageType,
+data class Troop
+(
+    val level: Int,
+    val name: String,
+    val maxLevel: Int,
+    val village: Village,
 
     @SerialName("superTroopIsActive")
     val isSuperTroopActive: Boolean? = false
diff --git a/src/main/java/com/lycoon/clashapi/models/player/enums/Role.kt b/src/main/java/com/lycoon/clashapi/models/player/enums/Role.kt
new file mode 100644
index 0000000..db85e9c
--- /dev/null
+++ b/src/main/java/com/lycoon/clashapi/models/player/enums/Role.kt
@@ -0,0 +1,14 @@
+package com.lycoon.clashapi.models.player.enums
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+enum class Role
+{
+    @SerialName("notMember") NOT_MEMBER,
+    @SerialName("member") MEMBER,
+    @SerialName("leader") LEADER,
+    @SerialName("admin") ADMIN,
+    @SerialName("coleader") COLEADER
+}
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/player/enums/Village.kt b/src/main/java/com/lycoon/clashapi/models/player/enums/Village.kt
new file mode 100644
index 0000000..5ccb19a
--- /dev/null
+++ b/src/main/java/com/lycoon/clashapi/models/player/enums/Village.kt
@@ -0,0 +1,12 @@
+package com.lycoon.clashapi.models.player.enums
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+enum class Village
+{
+    @SerialName("home") HOME_VILLAGE,
+    @SerialName("builderBase") BUILDER_BASE,
+    @SerialName("clanCapital") CLAN_CAPITAL
+}
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/player/enums/WarPreference.kt b/src/main/java/com/lycoon/clashapi/models/player/enums/WarPreference.kt
new file mode 100644
index 0000000..e26dda9
--- /dev/null
+++ b/src/main/java/com/lycoon/clashapi/models/player/enums/WarPreference.kt
@@ -0,0 +1,11 @@
+package com.lycoon.clashapi.models.player.enums
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+enum class WarPreference
+{
+    @SerialName("out") OUT,
+    @SerialName("in") IN,
+}
\ No newline at end of file
diff --git a/src/test/java/ClashAPITest.kt b/src/test/java/ClashAPITest.kt
index ac57ac6..6cce5cc 100644
--- a/src/test/java/ClashAPITest.kt
+++ b/src/test/java/ClashAPITest.kt
@@ -1,6 +1,8 @@
+import com.lycoon.clashapi.core.ClanQueryParamsBuilder
 import junit.framework.TestCase
 import com.lycoon.clashapi.core.ClashAPI
 import com.lycoon.clashapi.core.CoreUtils
+import com.lycoon.clashapi.core.SimpleQueryParamsBuilder
 import java.io.FileInputStream
 import java.io.IOException
 import com.lycoon.clashapi.core.exception.NotFoundException
@@ -16,7 +18,7 @@ import java.util.*
 
 const val CLAN_TAG = "UPCU2098"
 const val CONFIG = "tokens.properties"
-const val PLAYER_TAG = "PGYROPR"
+const val PLAYER_TAG = "PGYR0PR"
 
 class ClashAPITest(playerTestMethod: String?) : TestCase(playerTestMethod) {
     private val clashAPI: ClashAPI
@@ -28,29 +30,13 @@ class ClashAPITest(playerTestMethod: String?) : TestCase(playerTestMethod) {
             tokens.load(FileInputStream(CONFIG))
         } catch (ignored: IOException) {
         }
-        //clashAPI = ClashAPI(tokens.getProperty("clash-of-clans"))
-        clashAPI = ClashAPI("");
+        clashAPI = ClashAPI(tokens.getProperty("clash-of-clans"))
     }
 
-    @Serializable
-    data class TestSerialize(
-        val result: TestEnum,
-        val teamSize: Int = 0,
-    )
-    {
-        enum class TestEnum {LOSE, WIN, TIE}
-    }
-
-    fun testDebug() {
-        val json = "{ \"result\": \"TIE\", \"teamSize\": 5 }"
-        val deserialized = CoreUtils.json.decodeFromString<TestSerialize>(json);
-        println(deserialized);
-    }
-
-    fun testWarlog() {
+    /*fun testWarlog() {
         val warlog = clashAPI.getWarlog(CLAN_TAG)
         assertNotNull(warlog)
-    }
+    }*/
 
     fun testClanMembers() {
         val clanMembers = clashAPI.getClanMembers(CLAN_TAG)
@@ -77,7 +63,7 @@ class ClashAPITest(playerTestMethod: String?) : TestCase(playerTestMethod) {
         assertNotNull(locations)
     }
 
-    fun testWarLeague() {
+    /*fun testWarLeague() {
         val warLeague = clashAPI.getWarLeague("48000000")
         assertNotNull(warLeague)
     }
@@ -85,7 +71,7 @@ class ClashAPITest(playerTestMethod: String?) : TestCase(playerTestMethod) {
     fun testWarLeagues() {
         val warLeagues = clashAPI.getWarLeagues()
         assertNotNull(warLeagues)
-    }
+    }*/
 
     fun testPlayerLabels() {
         val playerLabels = clashAPI.getPlayerLabels()
@@ -101,15 +87,15 @@ class ClashAPITest(playerTestMethod: String?) : TestCase(playerTestMethod) {
         val warLeagueGroup = clashAPI.getWarLeagueGroup("#C0GJPLJG")
         assertNotNull(warLeagueGroup)
         print(warLeagueGroup.toString())
-    }*/
+    }
 
-    /*fun testWarLeagueWar() {
+    fun testWarLeagueWar() {
         val warLeagueWar = clashAPI.getWarLeagueWar("#0")
         assertNotNull(warLeagueWar)
         print(warLeagueWar.toString())
-    }*/
+    }
 
-    /*fun testClanWar() {
+    fun testClanWar() {
         val clanWar = clashAPI.getCurrentWar("#C0GJPLJG")
         assertNotNull(clanWar)
         print(clanWar.toString())
@@ -143,6 +129,12 @@ class ClashAPITest(playerTestMethod: String?) : TestCase(playerTestMethod) {
         assertEquals(clan.tag, "#$CLAN_TAG")
     }
 
+    fun testClanSearch() {
+        val query = ClanQueryParamsBuilder(name = "toto");
+        val clans = clashAPI.getClans(query);
+        assertNotNull(clans)
+    }
+
     fun testPlayer404() {
         try {
             clashAPI.getPlayer("404")

From b987149cbc20aad7e47b87a35be9b2c31ce98f91 Mon Sep 17 00:00:00 2001
From: Lycoon <hugo.bois@hotmail.fr>
Date: Tue, 21 Nov 2023 17:31:37 +0100
Subject: [PATCH 4/7] chore: updated pom.xml and README

---
 README.md | 32 ++++++++++++++++++++++++++------
 pom.xml   |  2 +-
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 754c145..1210c52 100644
--- a/README.md
+++ b/README.md
@@ -7,12 +7,33 @@
   <img alt="GitHub code size in bytes" src="https://img.shields.io/github/languages/code-size/Lycoon/clash-api">
 </p>
 
-ClashAPI is a very simple yet very complete Kotlin wrapper for the Clash of Clans mobile game API. It allows developers to easily do requests to the game API without bothering about JSON and HTTP handling.
+ClashAPI is a very simple yet very complete Kotlin wrapper for the Clash of Clans mobile game API. 
+It allows developers to easily do requests to the game API without bothering about JSON and HTTP handling.
+It is intended to be lightweight and as intuitive as possible to use.
 
 ## How does it work?
-I analyzed JSON responses from the Clash of Clans API to recreate the models as Java structures so you don't have to deal with deserialization and data categorization each time. You can therefore simply access game data through classes and methods, all documented!
+I analyzed JSON responses from the Clash of Clans API to recreate the models as Java structures so you don't have to deal with deserialization and data categorization each time. You can therefore simply access game data through your Java/Kotlin (JVM) classes and methods, all documented!
+
+## Setup
+ClashAPI is available on Maven Central. You can add it to your project using Maven or Gradle.
+
+### Maven
+Inside your `<dependencies>` scope of your `pom.xml` file, add the following:
+```xml
+<dependency>
+    <groupId>io.github.lycoon</groupId>
+    <artifactId>clash-api</artifactId>
+    <version>5.0.0</version>
+</dependency>
+```
+
+### Gradle
+Inside your `dependencies` scope of your `build.gradle` file, add the following:
+```gradle
+implementation 'io.github.lycoon:clash-api:5.0.0'
+```
 
-## How to use it?
+## Quick start
 ```java
 // 1. Create an instance of ClashAPI by providing your Clash of Clans API token to the constructor
 ClashAPI clashAPI = new ClashAPI("token");
@@ -31,9 +52,8 @@ In order to make calls to the Clash of Clans API, Supercell (developer of the ga
 
 Though this token is linked to the IP address you gave, I would advise **not to hardcode it** inside your code, for safety sake. Paste it in a separate file that you would access from your code. It will prevent your token being spread if you ever share your files.
 
-## Dependencies
-* Kotlin serialization `1.3.1`
-* OkHttp `4.9.3`
+## Report bugs
+You've found a bug? Let me know by opening an issue. 
 
 ## Disclaimer
 *This material is unofficial and is not endorsed by Supercell. For more information see Supercell's Fan Content Policy: www.supercell.com/fan-content-policy.*
diff --git a/pom.xml b/pom.xml
index 30f4ffe..055c6ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>io.github.lycoon</groupId>
   <artifactId>clash-api</artifactId>
-  <version>4.0.0</version>
+  <version>5.0.0</version>
 
   <!-- Project metadata -->
   <name>${project.groupId}:${project.artifactId}</name>

From 0f6881e8d3a018909b1bf787ff1e1198842b94b8 Mon Sep 17 00:00:00 2001
From: Lycoon <hugo.bois@hotmail.fr>
Date: Wed, 22 Nov 2023 16:23:31 +0100
Subject: [PATCH 5/7] chore: fixing models serialization

---
 .gitignore                                        |  3 +--
 .../clashapi/models/capital/CapitalRaidSeason.kt  | 15 ++++++++-------
 .../models/capital/CapitalRaidSeasonAttack.kt     |  7 ++++---
 .../models/capital/CapitalRaidSeasonAttackLog.kt  |  9 +++++----
 .../models/capital/CapitalRaidSeasonClanInfo.kt   |  5 +++--
 .../models/capital/CapitalRaidSeasonDefenseLog.kt |  9 +++++----
 .../models/capital/CapitalRaidSeasonDistrict.kt   | 15 ++++++++-------
 .../models/capital/CapitalRaidSeasonMember.kt     | 15 ++++++++-------
 .../java/com/lycoon/clashapi/models/clan/Clan.kt  | 14 ++++++++------
 .../clashapi/models/league/BuilderBaseLeague.kt   |  5 +++--
 .../clashapi/models/league/CapitalLeague.kt       |  7 ++++---
 .../com/lycoon/clashapi/models/player/Player.kt   | 10 ++++++----
 .../clashapi/models/player/PlayerHouseElement.kt  | 12 ++++++------
 .../com/lycoon/clashapi/models/player/Troop.kt    |  5 +++--
 .../models/player/enums/PlayerHouseType.kt        | 13 +++++++++++++
 .../com/lycoon/clashapi/models/war/WarlogEntry.kt | 14 +++++++-------
 .../lycoon/clashapi/models/war/enums/WarResult.kt | 12 ++++++++++++
 src/test/java/ClashAPITest.kt                     |  5 +++++
 18 files changed, 109 insertions(+), 66 deletions(-)
 create mode 100644 src/main/java/com/lycoon/clashapi/models/player/enums/PlayerHouseType.kt
 create mode 100644 src/main/java/com/lycoon/clashapi/models/war/enums/WarResult.kt

diff --git a/.gitignore b/.gitignore
index ab0999e..cee57ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,8 +9,7 @@ tmp/
 *.bak
 *.swp
 *~.nib
-tokens.properties
-local.properties
+*.properties
 .settings/
 .loadpath
 .recommenders
diff --git a/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeason.kt b/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeason.kt
index 18955eb..648a0e0 100644
--- a/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeason.kt
+++ b/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeason.kt
@@ -3,17 +3,18 @@ package com.lycoon.clashapi.models.capital
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class CapitalRaidSeason(
+data class CapitalRaidSeason
+(
     val attackLog: List<CapitalRaidSeasonAttackLog>,
     val defenseLog: List<CapitalRaidSeasonDefenseLog>,
     val state: String? = null,
     val startTime: String? = null,
     val endTime: String? = null,
-    val capitalTotalLoot: Int? = 0,
-    val raidsCompleted: Int? = 0,
-    val totalAttacks: Int? = 0,
-    val enemyDistrictsDestroyed: Int? = 0,
-    val offensiveReward: Int? = 0,
-    val defensiveReward: Int? = 0,
+    val capitalTotalLoot: Int = 0,
+    val raidsCompleted: Int = 0,
+    val totalAttacks: Int = 0,
+    val enemyDistrictsDestroyed: Int = 0,
+    val offensiveReward: Int = 0,
+    val defensiveReward: Int = 0,
     val members: List<CapitalRaidSeasonMember>
 )
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonAttack.kt b/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonAttack.kt
index 61294eb..1e18712 100644
--- a/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonAttack.kt
+++ b/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonAttack.kt
@@ -3,8 +3,9 @@ package com.lycoon.clashapi.models.capital
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class CapitalRaidSeasonAttack(
+data class CapitalRaidSeasonAttack
+(
     val attacker: CapitalRaidSeasonAttacker,
-    val destructionPercent: Int? = 0,
-    val stars: Int? = 0
+    val destructionPercent: Int = 0,
+    val stars: Int = 0
 )
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonAttackLog.kt b/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonAttackLog.kt
index 86e1c09..b51b250 100644
--- a/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonAttackLog.kt
+++ b/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonAttackLog.kt
@@ -3,10 +3,11 @@ package com.lycoon.clashapi.models.capital
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class CapitalRaidSeasonAttackLog(
+data class CapitalRaidSeasonAttackLog
+(
     val defender: CapitalRaidSeasonClanInfo,
-    val attackCount: Int? = 0,
-    val districtCount: Int? = 0,
-    val districtsDestroyed: Int? = 0,
+    val attackCount: Int = 0,
+    val districtCount: Int = 0,
+    val districtsDestroyed: Int = 0,
     val districts: List<CapitalRaidSeasonDistrict>
 )
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonClanInfo.kt b/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonClanInfo.kt
index 7acc706..6b7e7df 100644
--- a/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonClanInfo.kt
+++ b/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonClanInfo.kt
@@ -4,9 +4,10 @@ import com.lycoon.clashapi.models.common.BadgeUrls
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class CapitalRaidSeasonClanInfo(
+data class CapitalRaidSeasonClanInfo
+(
     val tag: String? = null,
     val name: String? = null,
-    val level: Int? = 0,
+    val level: Int = 0,
     val badgeUrls: BadgeUrls? = null
 )
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonDefenseLog.kt b/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonDefenseLog.kt
index 105168f..908ad59 100644
--- a/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonDefenseLog.kt
+++ b/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonDefenseLog.kt
@@ -3,10 +3,11 @@ package com.lycoon.clashapi.models.capital
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class CapitalRaidSeasonDefenseLog(
+data class CapitalRaidSeasonDefenseLog
+(
     val defender: CapitalRaidSeasonClanInfo,
-    val attackCount: Int? = 0,
-    val districtCount: Int? = 0,
-    val districtsDestroyed: Int? = 0,
+    val attackCount: Int = 0,
+    val districtCount: Int = 0,
+    val districtsDestroyed: Int = 0,
     val districts: List<CapitalRaidSeasonDistrict>
 )
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonDistrict.kt b/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonDistrict.kt
index 83a3d7f..5f30264 100644
--- a/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonDistrict.kt
+++ b/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonDistrict.kt
@@ -3,13 +3,14 @@ package com.lycoon.clashapi.models.capital
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class CapitalRaidSeasonDistrict(
-    val stars: Int? = 0,
+data class CapitalRaidSeasonDistrict
+(
+    val id: Int = 0,
     val name: String? = null,
-    val id: Int? = 0,
-    val destructionPercent: Float? = 0f,
-    val attackCount: Int? = 0,
-    val totalLooted: Int? = 0,
+    val stars: Int = 0,
+    val destructionPercent: Float = 0f,
+    val attackCount: Int = 0,
+    val totalLooted: Int = 0,
     val attacks: List<CapitalRaidSeasonAttack>,
-    val districtHallLevel: Int? = 0
+    val districtHallLevel: Int = 0
 )
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonMember.kt b/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonMember.kt
index 7fd1d69..b351788 100644
--- a/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonMember.kt
+++ b/src/main/java/com/lycoon/clashapi/models/capital/CapitalRaidSeasonMember.kt
@@ -3,11 +3,12 @@ package com.lycoon.clashapi.models.capital
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class CapitalRaidSeasonMember(
-    val tag: String? = null,
-    val name: String? = null,
-    val attacks: Int? = 0,
-    val attackLimit: Int? = 0,
-    val bonusAttackLimit: Int? = 0,
-    val capitalResourcesLooted: Int? = 0
+data class CapitalRaidSeasonMember
+(
+    val tag: String,
+    val name: String,
+    val attacks: Int = 0,
+    val attackLimit: Int = 0,
+    val bonusAttackLimit: Int = 0,
+    val capitalResourcesLooted: Int = 0
 )
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/clan/Clan.kt b/src/main/java/com/lycoon/clashapi/models/clan/Clan.kt
index 3d96938..744ff26 100644
--- a/src/main/java/com/lycoon/clashapi/models/clan/Clan.kt
+++ b/src/main/java/com/lycoon/clashapi/models/clan/Clan.kt
@@ -8,8 +8,8 @@ import com.lycoon.clashapi.models.common.Label
 import com.lycoon.clashapi.models.common.Language
 import com.lycoon.clashapi.models.common.Location
 import com.lycoon.clashapi.models.league.CapitalLeague
-import com.lycoon.clashapi.models.war.WarMember
 import com.lycoon.clashapi.models.warleague.WarLeague
+import jdk.nashorn.internal.objects.annotations.Getter
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -19,16 +19,17 @@ data class Clan
     @SerialName("type")
     val inviteType: InviteType,
 
+    @get:Getter(name = "isFamilyFriendly")
+    val isFamilyFriendly: Boolean = false,
     val tag: String,
     val name: String,
     val clanLevel: Int = 0,
     val clanPoints: Int = 0,
     val description: String? = null,          // nullable when using clan search
-    val isFamilyFriendly: Boolean = false,
-    val chatLanguage: Language? = null,
+    val chatLanguage: Language? = null,       // nullable when not set
     val labels: List<Label>,
-    val location: Location? = null,
-    val badgeUrls: BadgeUrls? = null,
+    val location: Location? = null,           // nullable when using clan search
+    val badgeUrls: BadgeUrls,
     val members: Int = 0,
     val memberList: List<ClanMember>? = null, // nullable when using clan search
 
@@ -44,9 +45,10 @@ data class Clan
     val clanCapitalPoints: Int = 0,
     val clanCapital: ClanCapital? = null,     // nullable if clan has no capital
 
+    @get:Getter(name = "isWarLogPublic")
+    val isWarLogPublic: Boolean = false,
     val warLeague: WarLeague,
     val capitalLeague: CapitalLeague,
-    val isWarLogPublic: Boolean = false,
     val warFrequency: WarFrequency,
     val warWinStreak: Int = 0,
     val warWins: Int = 0,
diff --git a/src/main/java/com/lycoon/clashapi/models/league/BuilderBaseLeague.kt b/src/main/java/com/lycoon/clashapi/models/league/BuilderBaseLeague.kt
index 5837523..651a358 100644
--- a/src/main/java/com/lycoon/clashapi/models/league/BuilderBaseLeague.kt
+++ b/src/main/java/com/lycoon/clashapi/models/league/BuilderBaseLeague.kt
@@ -3,7 +3,8 @@ package com.lycoon.clashapi.models.league
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class BuilderBaseLeague(
+data class BuilderBaseLeague
+(
+    val id: Int = 0,
     val name: String? = null,
-    val id: Int? = 0
 )
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/league/CapitalLeague.kt b/src/main/java/com/lycoon/clashapi/models/league/CapitalLeague.kt
index bb35dc6..cdcf1fa 100644
--- a/src/main/java/com/lycoon/clashapi/models/league/CapitalLeague.kt
+++ b/src/main/java/com/lycoon/clashapi/models/league/CapitalLeague.kt
@@ -3,7 +3,8 @@ package com.lycoon.clashapi.models.league
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class CapitalLeague(
-        val name: String? = null,
-        val id: Int? = 0
+data class CapitalLeague
+(
+    val name: String? = null,
+    val id: Int = 0
 )
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/player/Player.kt b/src/main/java/com/lycoon/clashapi/models/player/Player.kt
index 8154f45..d43ef25 100644
--- a/src/main/java/com/lycoon/clashapi/models/player/Player.kt
+++ b/src/main/java/com/lycoon/clashapi/models/player/Player.kt
@@ -7,6 +7,9 @@ import com.lycoon.clashapi.models.player.enums.Role
 import com.lycoon.clashapi.models.player.enums.WarPreference
 import kotlinx.serialization.Serializable
 
+typealias Spell = Troop
+typealias Hero = Troop
+
 @Serializable
 data class Player
 (
@@ -24,15 +27,15 @@ data class Player
     val warStars: Int = 0,
     val achievements: List<Achievement>,
     val labels: List<Label>,
-    val clanCapitalContributions: Int? = 0,
+    val clanCapitalContributions: Int = 0,
 
     val builderBaseLeague: BuilderBaseLeague? = null,
     val league: League? = null,
     val legendStatistics: PlayerLegendStatistics? = null,
 
     val troops: List<Troop>,
-    val heroes: List<Troop>,
-    val spells: List<Troop>,
+    val heroes: List<Hero>,
+    val spells: List<Spell>,
 
     val bestTrophies: Int = 0,
     val builderBaseTrophies: Int = 0,
@@ -45,5 +48,4 @@ data class Player
     val versusBattleWins: Int = 0,
     val donations: Int = 0,
     val donationsReceived: Int = 0,
-
 )
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/player/PlayerHouseElement.kt b/src/main/java/com/lycoon/clashapi/models/player/PlayerHouseElement.kt
index cde592c..d8b8e00 100644
--- a/src/main/java/com/lycoon/clashapi/models/player/PlayerHouseElement.kt
+++ b/src/main/java/com/lycoon/clashapi/models/player/PlayerHouseElement.kt
@@ -1,11 +1,11 @@
 package com.lycoon.clashapi.models.player
 
+import com.lycoon.clashapi.models.player.enums.PlayerHouseType
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class PlayerHouseElement(
-    val id: Int? = 0,
-    val type: Type
-) {
-    enum class Type{ GROUND, ROOF, FOOT, DECO }
-}
\ No newline at end of file
+data class PlayerHouseElement
+(
+    val id: Int = 0,
+    val type: PlayerHouseType? = null
+)
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/player/Troop.kt b/src/main/java/com/lycoon/clashapi/models/player/Troop.kt
index d11cf76..a0d614f 100644
--- a/src/main/java/com/lycoon/clashapi/models/player/Troop.kt
+++ b/src/main/java/com/lycoon/clashapi/models/player/Troop.kt
@@ -1,6 +1,7 @@
 package com.lycoon.clashapi.models.player
 
 import com.lycoon.clashapi.models.player.enums.Village
+import jdk.nashorn.internal.objects.annotations.Getter
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -12,6 +13,6 @@ data class Troop
     val maxLevel: Int,
     val village: Village,
 
-    @SerialName("superTroopIsActive")
-    val isSuperTroopActive: Boolean? = false
+    @get:Getter(name = "isSuperTroopActive")
+    val superTroopIsActive: Boolean = false
 )
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/player/enums/PlayerHouseType.kt b/src/main/java/com/lycoon/clashapi/models/player/enums/PlayerHouseType.kt
new file mode 100644
index 0000000..f37801b
--- /dev/null
+++ b/src/main/java/com/lycoon/clashapi/models/player/enums/PlayerHouseType.kt
@@ -0,0 +1,13 @@
+package com.lycoon.clashapi.models.player.enums
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+enum class PlayerHouseType
+{
+    @SerialName("ground") GROUND,
+    @SerialName("roof") ROOF,
+    @SerialName("foot") FOOT,
+    @SerialName("deco") DECO
+}
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/war/WarlogEntry.kt b/src/main/java/com/lycoon/clashapi/models/war/WarlogEntry.kt
index 36c6f9d..054c749 100644
--- a/src/main/java/com/lycoon/clashapi/models/war/WarlogEntry.kt
+++ b/src/main/java/com/lycoon/clashapi/models/war/WarlogEntry.kt
@@ -1,15 +1,15 @@
 package com.lycoon.clashapi.models.war
 
+import com.lycoon.clashapi.models.war.enums.WarResult
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class WarlogEntry(
-    val clan: WarlogClan? = null,
+data class WarlogEntry
+(
+    val clan: WarlogClan,
     val teamSize: Int = 0,
-    val attacksPerMember: Int? = 0,
+    val attacksPerMember: Int = 0,
     val opponent: WarlogClan? = null,
     val endTime: String? = null,
-    val result: Result
-) {
-    enum class Result { LOSE, WIN, TIE }
-}
\ No newline at end of file
+    val result: WarResult
+)
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/war/enums/WarResult.kt b/src/main/java/com/lycoon/clashapi/models/war/enums/WarResult.kt
new file mode 100644
index 0000000..a8af00b
--- /dev/null
+++ b/src/main/java/com/lycoon/clashapi/models/war/enums/WarResult.kt
@@ -0,0 +1,12 @@
+package com.lycoon.clashapi.models.war.enums
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+enum class WarResult
+{
+    @SerialName("lose") LOSE,
+    @SerialName("win") WIN,
+    @SerialName("tie") TIE
+}
\ No newline at end of file
diff --git a/src/test/java/ClashAPITest.kt b/src/test/java/ClashAPITest.kt
index 6cce5cc..9a44f68 100644
--- a/src/test/java/ClashAPITest.kt
+++ b/src/test/java/ClashAPITest.kt
@@ -122,6 +122,11 @@ class ClashAPITest(playerTestMethod: String?) : TestCase(playerTestMethod) {
         assertEquals(player.tag, "#$PLAYER_TAG")
     }
 
+    fun testNewPlayer() {
+        val player = clashAPI.getPlayer("#GL2GLGLYR")
+        assertNotNull(player)
+    }
+
     fun testClanWithSharp() {
         val clan = clashAPI.getClan("#$CLAN_TAG")
         assertNotNull(clan)

From a648e3a367665b8f732301db77f155f76609fd5a Mon Sep 17 00:00:00 2001
From: Lycoon <hugo.bois@hotmail.fr>
Date: Wed, 22 Nov 2023 17:31:10 +0100
Subject: [PATCH 6/7] chore: cleaned API architecture by adding interfaces and
 ClashAPIClient abstract class

---
 .../java/com/lycoon/clashapi/core/ClashAPI.kt | 518 +++---------------
 .../lycoon/clashapi/core/ClashAPIClient.kt    |  41 ++
 .../com/lycoon/clashapi/core/CoreUtils.kt     |   2 +-
 .../AuthException.kt                          |  10 +-
 .../BadRequestException.kt                    |  10 +-
 .../ClashAPIException.kt                      |  14 +-
 .../MaintenanceException.kt                   |  10 +-
 .../NotFoundException.kt                      |  10 +-
 .../RateLimitException.kt                     |  10 +-
 .../UnknownException.kt                       |  10 +-
 .../clashapi/core/interfaces/IClanAPI.kt      | 123 +++++
 .../clashapi/core/interfaces/IGoldPassAPI.kt  |  20 +
 .../clashapi/core/interfaces/ILabelAPI.kt     |  35 ++
 .../clashapi/core/interfaces/ILeagueAPI.kt    | 151 +++++
 .../clashapi/core/interfaces/ILocationAPI.kt  | 140 +++++
 .../clashapi/core/interfaces/IPlayerAPI.kt    |  34 ++
 src/test/java/ClashAPITest.kt                 |  12 +-
 17 files changed, 655 insertions(+), 495 deletions(-)
 create mode 100644 src/main/java/com/lycoon/clashapi/core/ClashAPIClient.kt
 rename src/main/java/com/lycoon/clashapi/core/{exception => exceptions}/AuthException.kt (66%)
 rename src/main/java/com/lycoon/clashapi/core/{exception => exceptions}/BadRequestException.kt (71%)
 rename src/main/java/com/lycoon/clashapi/core/{exception => exceptions}/ClashAPIException.kt (74%)
 rename src/main/java/com/lycoon/clashapi/core/{exception => exceptions}/MaintenanceException.kt (76%)
 rename src/main/java/com/lycoon/clashapi/core/{exception => exceptions}/NotFoundException.kt (68%)
 rename src/main/java/com/lycoon/clashapi/core/{exception => exceptions}/RateLimitException.kt (74%)
 rename src/main/java/com/lycoon/clashapi/core/{exception => exceptions}/UnknownException.kt (66%)
 create mode 100644 src/main/java/com/lycoon/clashapi/core/interfaces/IClanAPI.kt
 create mode 100644 src/main/java/com/lycoon/clashapi/core/interfaces/IGoldPassAPI.kt
 create mode 100644 src/main/java/com/lycoon/clashapi/core/interfaces/ILabelAPI.kt
 create mode 100644 src/main/java/com/lycoon/clashapi/core/interfaces/ILeagueAPI.kt
 create mode 100644 src/main/java/com/lycoon/clashapi/core/interfaces/ILocationAPI.kt
 create mode 100644 src/main/java/com/lycoon/clashapi/core/interfaces/IPlayerAPI.kt

diff --git a/src/main/java/com/lycoon/clashapi/core/ClashAPI.kt b/src/main/java/com/lycoon/clashapi/core/ClashAPI.kt
index 6094bc2..51d2f25 100644
--- a/src/main/java/com/lycoon/clashapi/core/ClashAPI.kt
+++ b/src/main/java/com/lycoon/clashapi/core/ClashAPI.kt
@@ -2,9 +2,8 @@ package com.lycoon.clashapi.core
 
 import com.lycoon.clashapi.core.CoreUtils.deserialize
 import com.lycoon.clashapi.core.CoreUtils.formatTag
-import com.lycoon.clashapi.core.CoreUtils.checkResponse
 import com.lycoon.clashapi.core.CoreUtils.unwrapList
-import com.lycoon.clashapi.core.exception.ClashAPIException
+import com.lycoon.clashapi.core.interfaces.*
 import com.lycoon.clashapi.models.capital.CapitalRaidSeason
 import com.lycoon.clashapi.models.capital.CapitalRanking
 import com.lycoon.clashapi.models.clan.*
@@ -15,192 +14,72 @@ import com.lycoon.clashapi.models.league.League
 import com.lycoon.clashapi.models.league.LeagueSeason
 import com.lycoon.clashapi.models.player.*
 import com.lycoon.clashapi.models.war.War
-import com.lycoon.clashapi.models.war.Warlog
 import com.lycoon.clashapi.models.war.WarlogEntry
 import com.lycoon.clashapi.models.warleague.WarLeague
 import com.lycoon.clashapi.models.warleague.WarLeagueGroup
-import okhttp3.*
-import okhttp3.MediaType.Companion.toMediaTypeOrNull
-import okhttp3.RequestBody.Companion.toRequestBody
-import java.io.IOException
+
+interface IClashAPI: IClanAPI, IPlayerAPI, ILeagueAPI, ILocationAPI, IGoldPassAPI, ILabelAPI
 
 /**
  * Create an instance of this class to start using the API.<br></br>
- *
  * Are you lost? Check the [README](https://github.com/Lycoon/clash-api) to see what ClashAPI is all about.
  */
-class ClashAPI(private val token: String)
+class ClashAPI(token: String) : ClashAPIClient(token), IClashAPI
 {
-    private val http: OkHttpClient = OkHttpClient()
-
-    private fun getBaseRequest(suffix: String, queryParamsBuilder: QueryParamsBuilder? = null): Request.Builder
-    {
-        val query = queryParamsBuilder?.build() ?: ""
-        return Request.Builder()
-                .header("authorization", "Bearer $token")
-                .url(CoreUtils.URL + CoreUtils.API_VERSION + suffix + query)
-    }
-
-    @Throws(IOException::class, ClashAPIException::class)
-    private fun get(url: String, queryParamsBuilder: QueryParamsBuilder? = null): Response
-    {
-        val req = getBaseRequest(url, queryParamsBuilder).build()
-        val res = http.newCall(req).execute()
-        return checkResponse(res)
-    }
-
-    @Throws(IOException::class, ClashAPIException::class)
-    private fun post(url: String, body: RequestBody): Response
-    {
-        val res = http.newCall(getBaseRequest(url).post(body).build()).execute()
-        return checkResponse(res)
-    }
-
-    private fun getTokenVerificationBody(token: String) : RequestBody
-    {
-        val contentType: MediaType? = "application/json; charset=utf-8".toMediaTypeOrNull()
-        return "{\"token\":\"$token\"}".toRequestBody(contentType)
-    }
-
     // ##############################################
     // ||                Clans API                 ||
     // ##############################################
 
-    /**
-     * Returns the warleague group in which the clan with the given tag is.
-     *
-     * @param clanTag `String` of the clan's tag
-     * @return WarLeagueGroup
-     * @see WarLeagueGroup
-     *
-     * @throws IOException if the deserialization failed
-     * @throws ClashAPIException if the request to the game API failed
-     */
-    @Throws(IOException::class, ClashAPIException::class)
-    fun getWarLeagueGroup(clanTag: String): WarLeagueGroup {
+    override fun getWarLeagueGroup(clanTag: String): WarLeagueGroup
+    {
         val tag = formatTag(clanTag)
         val res = get("/clans/$tag/currentwar/leaguegroup")
         return deserialize(res)
     }
 
-    /**
-     * Returns an individual warleague war associated to the given war tag.
-     * You can obtain individual CWL war tags from:
-     * `ClashAPI.getCWLGroup(clanTag).getRounds(index).getWarTags(index)`
-     *
-     * @param warTag `String` of the war tag
-     * @return War
-     * @see War
-     *
-     * @throws IOException if the deserialization failed
-     * @throws ClashAPIException if the request to the game API failed
-     */
-    @Throws(IOException::class, ClashAPIException::class)
-    fun getWarLeagueWar(warTag: String): War {
+    override fun getWarLeagueWar(warTag: String): War
+    {
         val tag = formatTag(warTag)
         val res = get("/clanwarleagues/wars/$tag")
         return deserialize(res)
     }
 
-    /**
-     * Returns the warlog of the clan with the given tag.
-     *
-     * @param clanTag `String` of the clan's tag
-     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
-     * @return List<WarlogEntry>
-     * @see WarlogEntry
-     *
-     * @throws IOException if the deserialization failed
-     * @throws ClashAPIException if the request to the game API failed
-     */
-    @Throws(IOException::class, ClashAPIException::class)
-    fun getWarlog(clanTag: String, queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<WarlogEntry> {
+    override fun getWarlog(clanTag: String, queryParamsBuilder: SimpleQueryParamsBuilder?): List<WarlogEntry>
+    {
         val tag = formatTag(clanTag)
         val res = get("/clans/$tag/warlog", queryParamsBuilder)
         return unwrapList(deserialize(res))
     }
 
-    /**
-     * Returns found clans from a clan search.
-     *
-     * @param queryParamsBuilder (optional) `ClanQueryBuilder` to build the query parameters
-     * @return List<Clan>
-     * @see Clan
-     *
-     * @throws IOException if the deserialization failed
-     * @throws ClashAPIException if the request to the game API failed
-     */
-    @Throws(IOException::class, ClashAPIException::class)
-    fun getClans(queryParamsBuilder: ClanQueryParamsBuilder? = null): List<Clan> {
+    override fun getClans(queryParamsBuilder: ClanQueryParamsBuilder?): List<Clan>
+    {
         val res = get("/clans", queryParamsBuilder)
         return unwrapList(deserialize(res))
     }
 
-    /**
-     * Returns the clan war occurring in the clan with the given tag.
-     *
-     * @param clanTag `String` of the clan's tag
-     * @return War
-     * @see War
-     *
-     * @throws IOException if the deserialization failed
-     * @throws ClashAPIException if the request to the game API failed
-     */
-    @Throws(IOException::class, ClashAPIException::class)
-    fun getCurrentWar(clanTag: String): War {
+    override fun getCurrentWar(clanTag: String): War
+    {
         val tag = formatTag(clanTag)
         val res = get("/clans/$tag/currentwar")
         return deserialize(res)
     }
 
-    /**
-     * Returns the clan attached to the tag.
-     *
-     * @param clanTag `String` of the clan's tag
-     * @return Clan
-     * @see Clan
-     *
-     * @throws IOException if the deserialization failed
-     * @throws ClashAPIException if the request to the game API failed
-     */
-    @Throws(IOException::class, ClashAPIException::class)
-    fun getClan(clanTag: String): Clan {
+    override fun getClan(clanTag: String): Clan
+    {
         val tag = formatTag(clanTag)
         val res = get("/clans/$tag")
         return deserialize(res)
     }
 
-    /**
-     * Returns the members of clan attached to the tag.
-     *
-     * @param clanTag `String` of the clan's tag
-     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
-     * @return List<ClanMember>
-     * @see ClanMember
-     *
-     * @throws IOException if the deserialization failed
-     * @throws ClashAPIException if the request to the game API failed
-     */
-    @Throws(IOException::class, ClashAPIException::class)
-    fun getClanMembers(clanTag: String, queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<ClanMember> {
+    override fun getClanMembers(clanTag: String, queryParamsBuilder: SimpleQueryParamsBuilder?): List<ClanMember>
+    {
         val tag = formatTag(clanTag)
         val res = get("/clans/$tag/members", queryParamsBuilder)
         return unwrapList(deserialize(res))
     }
 
-    /**
-     * Returns the capital raid seasons of clan attached to the tag.
-     *
-     * @param clanTag `String` of the clan's tag
-     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
-     * @return List<CapitalRaidSeason>
-     * @see CapitalRaidSeason
-     *
-     * @throws IOException if the deserialization failed
-     * @throws ClashAPIException if the request to the game API failed
-     */
-    @Throws(IOException::class, ClashAPIException::class)
-    fun getCapitalRaidSeasons(clanTag: String, queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<CapitalRaidSeason> {
+    override fun getCapitalRaidSeasons(clanTag: String, queryParamsBuilder: SimpleQueryParamsBuilder?): List<CapitalRaidSeason>
+    {
         val tag = formatTag(clanTag)
         val res = get("/clans/$tag/capitalraidseasons", queryParamsBuilder)
         return unwrapList(deserialize(res))
@@ -210,365 +89,142 @@ class ClashAPI(private val token: String)
     // ||                Player API                ||
     // ##############################################
 
-    /**
-     * Returns the player attached to the tag.
-     *
-     * @param playerTag `String` of the player's tag
-     * @return Player
-     * @see Player
-     *
-     * @throws IOException if the deserialization failed
-     * @throws ClashAPIException if the request to the game API failed
-     */
-    @Throws(IOException::class, ClashAPIException::class)
-    fun getPlayer(playerTag: String): Player {
+    override fun getPlayer(playerTag: String): Player
+    {
         val tag = formatTag(playerTag)
         val res = get("/players/$tag")
         return deserialize(res)
     }
 
-    /**
-     * Returns whether the given player tag is verified or not.
-     *
-     * @param playerTag `String` of the player's tag
-     * @param token `String` of the player token
-     * @return a boolean
-     *
-     * @throws IOException if the deserialization failed
-     * @throws ClashAPIException if the request to the game API failed
-     */
-    @Throws(IOException::class, ClashAPIException::class)
-    fun isVerifiedPlayer(playerTag: String, token: String): Boolean {
+    override fun isVerifiedPlayer(playerTag: String, token: String): Boolean
+    {
         val tag = formatTag(playerTag)
         val res = post("/players/$tag/verifytoken", getTokenVerificationBody(token))
-
         return deserialize<TokenResponse>(res).status == "ok"
     }
 
     // ##############################################
-    // ||               Leagues API                ||
+    // ||                League API                ||
     // ##############################################
 
-    /**
-     * Returns all capital leagues from the game.
-     *
-     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
-     * @return List<CapitalLeague>
-     * @see CapitalLeague
-     *
-     * @throws IOException if the deserialization failed
-     * @throws ClashAPIException if the request to the game API failed
-     */
-    @Throws(IOException::class, ClashAPIException::class)
-    fun getCapitalLeagues(queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<CapitalLeague> {
+    override fun getCapitalLeagues(queryParamsBuilder: SimpleQueryParamsBuilder?): List<CapitalLeague>
+    {
         val res = get("/capitalleagues", queryParamsBuilder)
         return unwrapList(deserialize(res))
     }
 
-    /**
-     * Returns all leagues from the game.
-     *
-     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
-     * @return List<League>
-     * @see League
-     *
-     * @throws IOException if the deserialization failed
-     * @throws ClashAPIException if the request to the game API failed
-     */
-    @Throws(IOException::class, ClashAPIException::class)
-    fun getLeagues(queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<League> {
+    override fun getLeagues(queryParamsBuilder: SimpleQueryParamsBuilder?): List<League>
+    {
         val res = get("/leagues", queryParamsBuilder)
         return unwrapList(deserialize(res))
     }
 
-    /**
-     * Returns league season rankings
-     *
-     * @param leagueId `String` of the league id
-     * @param seasonId `String` of the season id
-     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
-     * @return List<PlayerRanking>
-     * @see PlayerRanking
-     *
-     * @throws IOException if the deserialization failed
-     * @throws ClashAPIException if the request to the game API failed
-     */
-    @Throws(IOException::class, ClashAPIException::class)
-    fun getLeagueSeasonRankings(
-            leagueId: String,
-            seasonId: String,
-            queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<PlayerRanking>
+    override fun getLeagueSeasonRankings(
+            leagueId: String, seasonId: String,
+            queryParamsBuilder: SimpleQueryParamsBuilder?): List<PlayerRanking>
     {
         val res = get("/leagues/$leagueId/seasons/$seasonId", queryParamsBuilder)
         return unwrapList(deserialize(res))
     }
 
-    /**
-     * Returns capital league information
-     *
-     * @param leagueId `String` of the league id
-     * @return CapitalLeague
-     * @see CapitalLeague
-     *
-     * @throws IOException if the deserialization failed
-     * @throws ClashAPIException if the request to the game API failed
-     */
-    @Throws(IOException::class, ClashAPIException::class)
-    fun getCapitalLeague(leagueId: String): CapitalLeague {
+    override fun getCapitalLeague(leagueId: String): CapitalLeague
+    {
         val res = get("/capitalleagues/$leagueId")
         return deserialize(res)
     }
 
-    /**
-     * Returns builder base league information
-     *
-     * @param leagueId `String` of the league id
-     * @return BuilderBaseLeague
-     * @see BuilderBaseLeague
-     *
-     * @throws IOException if the deserialization failed
-     * @throws ClashAPIException if the request to the game API failed
-     */
-    @Throws(IOException::class, ClashAPIException::class)
-    fun getBuilderBaseLeague(leagueId: String): BuilderBaseLeague {
+    override fun getBuilderBaseLeague(leagueId: String): BuilderBaseLeague
+    {
         val res = get("/builderbaseleagues/$leagueId")
         return deserialize(res)
     }
 
-    /**
-     * Returns all builder base leagues from the game.
-     *
-     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
-     * @return List<BuilderBaseLeague>
-     * @see BuilderBaseLeague
-     *
-     * @throws IOException if the deserialization failed
-     * @throws ClashAPIException if the request to the game API failed
-     */
-    @Throws(IOException::class, ClashAPIException::class)
-    fun getBuilderBaseLeagues(queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<BuilderBaseLeague> {
+    override fun getBuilderBaseLeagues(queryParamsBuilder: SimpleQueryParamsBuilder?): List<BuilderBaseLeague>
+    {
         val res = get("/builderbaseleagues", queryParamsBuilder)
         return unwrapList(deserialize(res))
     }
 
-    /**
-     * Returns league information
-     *
-     * @param leagueId `String` of the league id
-     * @return League
-     * @see League
-     *
-     * @throws IOException if the deserialization failed
-     * @throws ClashAPIException if the request to the game API failed
-     */
-    @Throws(IOException::class, ClashAPIException::class)
-    fun getLeague(leagueId: String): League {
+    override fun getLeague(leagueId: String): League
+    {
         val res = get("/leagues/$leagueId")
         return deserialize(res)
     }
 
-    /**
-     * Returns league seasons
-     *
-     * @param leagueId `String` of the league id
-     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
-     * @return List<LeagueSeason>
-     * @see LeagueSeason
-     *
-     * @throws IOException if the deserialization failed
-     * @throws ClashAPIException if the request to the game API failed
-     */
-    @Throws(IOException::class, ClashAPIException::class)
-    fun getLeagueSeasons(leagueId: String, queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<LeagueSeason> {
+    override fun getLeagueSeasons(leagueId: String, queryParamsBuilder: SimpleQueryParamsBuilder?): List<LeagueSeason>
+    {
         val res = get("/leagues/$leagueId/seasons", queryParamsBuilder)
         return unwrapList(deserialize(res))
     }
 
-    /**
-     * Returns warleague information
-     *
-     * @param leagueId `String` of the league id
-     * @return WarLeague
-     * @see WarLeague
-     *
-     * @throws IOException if the deserialization failed
-     * @throws ClashAPIException if the request to the game API failed
-     */
-    @Throws(IOException::class, ClashAPIException::class)
-    fun getWarLeague(leagueId: String): WarLeague {
+    override fun getWarLeague(leagueId: String): WarLeague
+    {
         val res = get("/warleagues/$leagueId")
         return deserialize(res)
     }
 
-    /**
-     * Returns all warleagues
-     *
-     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
-     * @return List<WarLeague>
-     * @see WarLeague
-     *
-     * @throws IOException if the deserialization failed
-     * @throws ClashAPIException if the request to the game API failed
-     */
-    @Throws(IOException::class, ClashAPIException::class)
-    fun getWarLeagues(queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<WarLeague> {
+    override fun getWarLeagues(queryParamsBuilder: SimpleQueryParamsBuilder?): List<WarLeague>
+    {
         val res = get("/warleagues", queryParamsBuilder)
         return unwrapList(deserialize(res))
     }
 
     // ##############################################
-    // ||              Locations API               ||
+    // ||               Location API               ||
     // ##############################################
 
-    /**
-     * Returns clan rankings for a specific location
-     *
-     * @param locationId `String` of the location id
-     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
-     * @return List<ClanRanking>
-     * @see ClanRanking
-     *
-     * @throws IOException if the deserialization failed
-     * @throws ClashAPIException if the request to the game API failed
-     */
-    @Throws(IOException::class, ClashAPIException::class)
-    fun getClanRankings(locationId: String, queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<ClanRanking> {
+    override fun getClanRankings(locationId: String, queryParamsBuilder: SimpleQueryParamsBuilder?): List<ClanRanking>
+    {
         val res = get("/locations/${locationId}/rankings/clans", queryParamsBuilder)
         return unwrapList(deserialize(res))
     }
 
-    /**
-     * Returns player rankings for a specific location
-     *
-     * @param locationId `String` of the location id
-     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
-     * @return List<PlayerRanking>
-     * @see PlayerRanking
-     *
-     * @throws IOException if the deserialization failed
-     * @throws ClashAPIException if the request to the game API failed
-     */
-    @Throws(IOException::class, ClashAPIException::class)
-    fun getPlayerRankings(locationId: String, queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<PlayerRanking> {
+    override fun getPlayerRankings(locationId: String, queryParamsBuilder: SimpleQueryParamsBuilder?): List<PlayerRanking>
+    {
         val res = get("/locations/${locationId}/rankings/players", queryParamsBuilder)
         return unwrapList(deserialize(res))
     }
 
-    /**
-     * Returns clan builder base rankings for a specific location
-     *
-     * @param locationId `String` of the location id
-     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
-     * @return List<ClanBuilderBaseRanking>
-     * @see ClanBuilderBaseRanking
-     *
-     * @throws IOException if the deserialization failed
-     * @throws ClashAPIException if the request to the game API failed
-     */
-    @Throws(IOException::class, ClashAPIException::class)
-    fun getClanBuilderBaseRankings(locationId: String, queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<ClanBuilderBaseRanking> {
+    override fun getClanBuilderBaseRankings(locationId: String, queryParamsBuilder: SimpleQueryParamsBuilder?): List<ClanBuilderBaseRanking>
+    {
         val res = get("/locations/${locationId}/rankings/clans-builder-base", queryParamsBuilder)
         return unwrapList(deserialize(res))
     }
 
-    /**
-     * Returns clan versus rankings for a specific location
-     *
-     * @param locationId `String` of the location id
-     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
-     * @return List<ClanBuilderBaseRanking>
-     * @see ClanBuilderBaseRanking
-     *
-     * @throws IOException if the deserialization failed
-     * @throws ClashAPIException if the request to the game API failed
-     */
     @Deprecated("Use getClanBuilderBaseRankings instead")
-    @Throws(IOException::class, ClashAPIException::class)
-    fun getClanVersusRankings(locationId: String, queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<ClanBuilderBaseRanking> {
+    override fun getClanVersusRankings(locationId: String, queryParamsBuilder: SimpleQueryParamsBuilder?): List<ClanBuilderBaseRanking>
+    {
         val res = get("/locations/${locationId}/rankings/clans-versus", queryParamsBuilder)
         return unwrapList(deserialize(res))
     }
 
-    /**
-     * Returns player builder base rankings for a specific location
-     *
-     * @param locationId `String` of the location id
-     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
-     * @return List<PlayerBuilderBaseRanking>
-     * @see PlayerBuilderBaseRanking
-     *
-     * @throws IOException if the deserialization failed
-     * @throws ClashAPIException if the request to the game API failed
-     */
-    @Throws(IOException::class, ClashAPIException::class)
-    fun getPlayerBuilderBaseRankings(locationId: String, queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<PlayerBuilderBaseRanking> {
+    override fun getPlayerBuilderBaseRankings(locationId: String, queryParamsBuilder: SimpleQueryParamsBuilder?): List<PlayerBuilderBaseRanking>
+    {
         val res = get("/locations/${locationId}/rankings/players-builder-base", queryParamsBuilder)
         return unwrapList(deserialize(res))
     }
 
-    /**
-     * Returns player versus rankings for a specific location
-     *
-     * @param locationId `String` of the location id
-     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
-     * @return List<PlayerBuilderBaseRanking>
-     * @see PlayerBuilderBaseRanking
-     *
-     * @throws IOException if the deserialization failed
-     * @throws ClashAPIException if the request to the game API failed
-     */
     @Deprecated("Use getPlayerBuilderBaseRankings instead")
-    @Throws(IOException::class, ClashAPIException::class)
-    fun getPlayerVersusRankings(locationId: String, queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<PlayerBuilderBaseRanking> {
+    override fun getPlayerVersusRankings(locationId: String, queryParamsBuilder: SimpleQueryParamsBuilder?): List<PlayerBuilderBaseRanking>
+    {
         val res = get("/locations/${locationId}/rankings/players-versus", queryParamsBuilder)
         return unwrapList(deserialize(res))
     }
 
-    /**
-     * Returns locations
-     *
-     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
-     * @return List<Location>
-     * @see Location
-     *
-     * @throws IOException if the deserialization failed
-     * @throws ClashAPIException if the request to the game API failed
-     */
-    @Throws(IOException::class, ClashAPIException::class)
-    fun getLocations(queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<Location> {
+    override fun getLocations(queryParamsBuilder: SimpleQueryParamsBuilder?): List<Location>
+    {
         val res = get("/locations", queryParamsBuilder)
         return unwrapList(deserialize(res))
     }
 
-    /**
-     * Returns capital rankings for a specific location
-     *
-     * @param locationId `String` of the location id
-     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
-     * @return List<ClanCapitalRanking>
-     * @see CapitalRanking
-     *
-     * @throws IOException if the deserialization failed
-     * @throws ClashAPIException if the request to the game API failed
-     */
-    @Throws(IOException::class, ClashAPIException::class)
-    fun getCapitalRankings(locationId: String, queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<CapitalRanking> {
+    override fun getCapitalRankings(locationId: String, queryParamsBuilder: SimpleQueryParamsBuilder?): List<CapitalRanking>
+    {
         val res = get("/locations/$locationId/rankings/capitals", queryParamsBuilder)
         return unwrapList(deserialize(res))
     }
 
-    /**
-     * Returns specific location information
-     *
-     * @param locationId `String` of the location id
-     * @return Location
-     * @see Location
-     *
-     * @throws IOException if the deserialization failed
-     * @throws ClashAPIException if the request to the game API failed
-     */
-    @Throws(IOException::class, ClashAPIException::class)
-    fun getLocation(locationId: String): Location {
+    override fun getLocation(locationId: String): Location
+    {
         val res = get("/locations/$locationId")
         return deserialize(res)
     }
@@ -577,54 +233,24 @@ class ClashAPI(private val token: String)
     // ||               GoldPass API               ||
     // ##############################################
 
-    /**
-     * Returns gold pass information
-     *
-     * @return GoldPassSeason
-     * @see GoldPassSeason
-     *
-     * @throws IOException if the deserialization failed
-     * @throws ClashAPIException if the request to the game API failed
-     */
-    @Throws(IOException::class, ClashAPIException::class)
-    fun getGoldPass(): GoldPassSeason {
+    override fun getGoldPass(): GoldPassSeason
+    {
         val res = get("/goldpass/seasons/current")
         return deserialize(res)
     }
 
-
     // ##############################################
-    // ||                Labels API                ||
+    // ||                 Label API                ||
     // ##############################################
 
-    /**
-     * Returns player labels
-     *
-     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
-     * @return List<Label>
-     * @see Label
-     *
-     * @throws IOException if the deserialization failed
-     * @throws ClashAPIException if the request to the game API failed
-     */
-    @Throws(IOException::class, ClashAPIException::class)
-    fun getPlayerLabels(queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<Label> {
+    override fun getPlayerLabels(queryParamsBuilder: SimpleQueryParamsBuilder?): List<Label>
+    {
         val res = get("/labels/players", queryParamsBuilder)
         return unwrapList(deserialize(res))
     }
 
-    /**
-     * Returns clan labels
-     *
-     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
-     * @return List<Label>
-     * @see Label
-     *
-     * @throws IOException if the deserialization failed
-     * @throws ClashAPIException if the request to the game API failed
-     */
-    @Throws(IOException::class, ClashAPIException::class)
-    fun getClanLabels(queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<Label> {
+    override fun getClanLabels(queryParamsBuilder: SimpleQueryParamsBuilder?): List<Label>
+    {
         val res = get("/labels/clans", queryParamsBuilder)
         return unwrapList(deserialize(res))
     }
diff --git a/src/main/java/com/lycoon/clashapi/core/ClashAPIClient.kt b/src/main/java/com/lycoon/clashapi/core/ClashAPIClient.kt
new file mode 100644
index 0000000..c4efb77
--- /dev/null
+++ b/src/main/java/com/lycoon/clashapi/core/ClashAPIClient.kt
@@ -0,0 +1,41 @@
+package com.lycoon.clashapi.core
+
+import com.lycoon.clashapi.core.exceptions.ClashAPIException
+import okhttp3.*
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.RequestBody.Companion.toRequestBody
+import java.io.IOException
+import java.util.concurrent.CompletableFuture
+
+abstract class ClashAPIClient(private val token: String)
+{
+    private val http: OkHttpClient = OkHttpClient()
+    private fun getBaseRequest(suffix: String, queryParamsBuilder: QueryParamsBuilder? = null): Request.Builder
+    {
+        val query = queryParamsBuilder?.build() ?: ""
+        return Request.Builder()
+                .header("authorization", "Bearer $token")
+                .url(CoreUtils.URL + CoreUtils.API_VERSION + suffix + query)
+    }
+
+    @Throws(IOException::class, ClashAPIException::class)
+    protected fun get(url: String, queryParamsBuilder: QueryParamsBuilder? = null): Response
+    {
+        val req = getBaseRequest(url, queryParamsBuilder).build()
+        val res = http.newCall(req).execute()
+        return CoreUtils.checkResponse(res)
+    }
+
+    @Throws(IOException::class, ClashAPIException::class)
+    protected fun post(url: String, body: RequestBody): Response
+    {
+        val res = http.newCall(getBaseRequest(url).post(body).build()).execute()
+        return CoreUtils.checkResponse(res)
+    }
+
+    protected fun getTokenVerificationBody(token: String) : RequestBody
+    {
+        val contentType: MediaType? = "application/json; charset=utf-8".toMediaTypeOrNull()
+        return "{\"token\":\"$token\"}".toRequestBody(contentType)
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/core/CoreUtils.kt b/src/main/java/com/lycoon/clashapi/core/CoreUtils.kt
index 3ee83f0..81ba5c1 100644
--- a/src/main/java/com/lycoon/clashapi/core/CoreUtils.kt
+++ b/src/main/java/com/lycoon/clashapi/core/CoreUtils.kt
@@ -1,6 +1,6 @@
 package com.lycoon.clashapi.core
 
-import com.lycoon.clashapi.core.exception.*
+import com.lycoon.clashapi.core.exceptions.*
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
diff --git a/src/main/java/com/lycoon/clashapi/core/exception/AuthException.kt b/src/main/java/com/lycoon/clashapi/core/exceptions/AuthException.kt
similarity index 66%
rename from src/main/java/com/lycoon/clashapi/core/exception/AuthException.kt
rename to src/main/java/com/lycoon/clashapi/core/exceptions/AuthException.kt
index a0824ff..622b38d 100644
--- a/src/main/java/com/lycoon/clashapi/core/exception/AuthException.kt
+++ b/src/main/java/com/lycoon/clashapi/core/exceptions/AuthException.kt
@@ -1,6 +1,6 @@
-package com.lycoon.clashapi.core.exception
-
-/**
- * Thrown if the API token is not valid
- */
+package com.lycoon.clashapi.core.exceptions
+
+/**
+ * Thrown if the API token is not valid
+ */
 class AuthException : ClashAPIException("403")
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/core/exception/BadRequestException.kt b/src/main/java/com/lycoon/clashapi/core/exceptions/BadRequestException.kt
similarity index 71%
rename from src/main/java/com/lycoon/clashapi/core/exception/BadRequestException.kt
rename to src/main/java/com/lycoon/clashapi/core/exceptions/BadRequestException.kt
index a4294ed..02d99da 100644
--- a/src/main/java/com/lycoon/clashapi/core/exception/BadRequestException.kt
+++ b/src/main/java/com/lycoon/clashapi/core/exceptions/BadRequestException.kt
@@ -1,6 +1,6 @@
-package com.lycoon.clashapi.core.exception
-
-/**
- * Thrown if incorrect parameters are given to the request
- */
+package com.lycoon.clashapi.core.exceptions
+
+/**
+ * Thrown if incorrect parameters are given to the request
+ */
 class BadRequestException : ClashAPIException("400")
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/core/exception/ClashAPIException.kt b/src/main/java/com/lycoon/clashapi/core/exceptions/ClashAPIException.kt
similarity index 74%
rename from src/main/java/com/lycoon/clashapi/core/exception/ClashAPIException.kt
rename to src/main/java/com/lycoon/clashapi/core/exceptions/ClashAPIException.kt
index acd769d..1d6f8e5 100644
--- a/src/main/java/com/lycoon/clashapi/core/exception/ClashAPIException.kt
+++ b/src/main/java/com/lycoon/clashapi/core/exceptions/ClashAPIException.kt
@@ -1,8 +1,8 @@
-package com.lycoon.clashapi.core.exception
-
-import java.lang.Exception
-
-/**
- * Parent class for ClashAPI exceptions
- */
+package com.lycoon.clashapi.core.exceptions
+
+import java.lang.Exception
+
+/**
+ * Parent class for ClashAPI exceptions
+ */
 open class ClashAPIException(message: String) : Exception(message)
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/core/exception/MaintenanceException.kt b/src/main/java/com/lycoon/clashapi/core/exceptions/MaintenanceException.kt
similarity index 76%
rename from src/main/java/com/lycoon/clashapi/core/exception/MaintenanceException.kt
rename to src/main/java/com/lycoon/clashapi/core/exceptions/MaintenanceException.kt
index 5f55cd0..ea29ae7 100644
--- a/src/main/java/com/lycoon/clashapi/core/exception/MaintenanceException.kt
+++ b/src/main/java/com/lycoon/clashapi/core/exceptions/MaintenanceException.kt
@@ -1,6 +1,6 @@
-package com.lycoon.clashapi.core.exception
-
-/**
- * Thrown if the request couldn't be executed because of Clash of Clans undergoing maintenance
- */
+package com.lycoon.clashapi.core.exceptions
+
+/**
+ * Thrown if the request couldn't be executed because of Clash of Clans undergoing maintenance
+ */
 class MaintenanceException : ClashAPIException("503")
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/core/exception/NotFoundException.kt b/src/main/java/com/lycoon/clashapi/core/exceptions/NotFoundException.kt
similarity index 68%
rename from src/main/java/com/lycoon/clashapi/core/exception/NotFoundException.kt
rename to src/main/java/com/lycoon/clashapi/core/exceptions/NotFoundException.kt
index 2e1431d..69b6d41 100644
--- a/src/main/java/com/lycoon/clashapi/core/exception/NotFoundException.kt
+++ b/src/main/java/com/lycoon/clashapi/core/exceptions/NotFoundException.kt
@@ -1,6 +1,6 @@
-package com.lycoon.clashapi.core.exception
-
-/**
- * Thrown when the requested URL is not found
- */
+package com.lycoon.clashapi.core.exceptions
+
+/**
+ * Thrown when the requested URL is not found
+ */
 class NotFoundException : ClashAPIException("404")
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/core/exception/RateLimitException.kt b/src/main/java/com/lycoon/clashapi/core/exceptions/RateLimitException.kt
similarity index 74%
rename from src/main/java/com/lycoon/clashapi/core/exception/RateLimitException.kt
rename to src/main/java/com/lycoon/clashapi/core/exceptions/RateLimitException.kt
index 737fd8d..cac13c1 100644
--- a/src/main/java/com/lycoon/clashapi/core/exception/RateLimitException.kt
+++ b/src/main/java/com/lycoon/clashapi/core/exceptions/RateLimitException.kt
@@ -1,6 +1,6 @@
-package com.lycoon.clashapi.core.exception
-
-/**
- * Thrown when too many requests are made to the game API within a certain period
- */
+package com.lycoon.clashapi.core.exceptions
+
+/**
+ * Thrown when too many requests are made to the game API within a certain period
+ */
 class RateLimitException : ClashAPIException("429")
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/core/exception/UnknownException.kt b/src/main/java/com/lycoon/clashapi/core/exceptions/UnknownException.kt
similarity index 66%
rename from src/main/java/com/lycoon/clashapi/core/exception/UnknownException.kt
rename to src/main/java/com/lycoon/clashapi/core/exceptions/UnknownException.kt
index 7ffbd7b..708c431 100644
--- a/src/main/java/com/lycoon/clashapi/core/exception/UnknownException.kt
+++ b/src/main/java/com/lycoon/clashapi/core/exceptions/UnknownException.kt
@@ -1,6 +1,6 @@
-package com.lycoon.clashapi.core.exception
-
-/**
- * Thrown if an unknown error occurs
- */
+package com.lycoon.clashapi.core.exceptions
+
+/**
+ * Thrown if an unknown error occurs
+ */
 class UnknownException : ClashAPIException("500")
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/core/interfaces/IClanAPI.kt b/src/main/java/com/lycoon/clashapi/core/interfaces/IClanAPI.kt
new file mode 100644
index 0000000..af00f26
--- /dev/null
+++ b/src/main/java/com/lycoon/clashapi/core/interfaces/IClanAPI.kt
@@ -0,0 +1,123 @@
+package com.lycoon.clashapi.core.interfaces
+
+import com.lycoon.clashapi.core.ClanQueryParamsBuilder
+import com.lycoon.clashapi.core.SimpleQueryParamsBuilder
+import com.lycoon.clashapi.core.exceptions.ClashAPIException
+import com.lycoon.clashapi.models.capital.CapitalRaidSeason
+import com.lycoon.clashapi.models.clan.Clan
+import com.lycoon.clashapi.models.clan.ClanMember
+import com.lycoon.clashapi.models.war.War
+import com.lycoon.clashapi.models.war.WarlogEntry
+import com.lycoon.clashapi.models.warleague.WarLeagueGroup
+import java.io.IOException
+
+interface IClanAPI
+{
+    /**
+     * Returns the warleague group in which the clan with the given tag is.
+     *
+     * @param clanTag `String` of the clan's tag
+     * @return WarLeagueGroup
+     * @see WarLeagueGroup
+     *
+     * @throws IOException if the deserialization failed
+     * @throws ClashAPIException if the request to the game API failed
+     */
+    @Throws(IOException::class, ClashAPIException::class)
+    fun getWarLeagueGroup(clanTag: String): WarLeagueGroup
+
+    /**
+     * Returns an individual warleague war associated to the given war tag.
+     * You can obtain individual CWL war tags from:
+     * `ClashAPI.getCWLGroup(clanTag).getRounds(index).getWarTags(index)`
+     *
+     * @param warTag `String` of the war tag
+     * @return War
+     * @see War
+     *
+     * @throws IOException if the deserialization failed
+     * @throws ClashAPIException if the request to the game API failed
+     */
+    @Throws(IOException::class, ClashAPIException::class)
+    fun getWarLeagueWar(warTag: String): War
+
+    /**
+     * Returns the warlog of the clan with the given tag.
+     *
+     * @param clanTag `String` of the clan's tag
+     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
+     * @return List<WarlogEntry>
+     * @see WarlogEntry
+     *
+     * @throws IOException if the deserialization failed
+     * @throws ClashAPIException if the request to the game API failed
+     */
+    @Throws(IOException::class, ClashAPIException::class)
+    fun getWarlog(clanTag: String, queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<WarlogEntry>
+
+    /**
+     * Returns found clans from a clan search.
+     *
+     * @param queryParamsBuilder (optional) `ClanQueryBuilder` to build the query parameters
+     * @return List<Clan>
+     * @see Clan
+     *
+     * @throws IOException if the deserialization failed
+     * @throws ClashAPIException if the request to the game API failed
+     */
+    @Throws(IOException::class, ClashAPIException::class)
+    fun getClans(queryParamsBuilder: ClanQueryParamsBuilder? = null): List<Clan>
+
+    /**
+     * Returns the clan war occurring in the clan with the given tag.
+     *
+     * @param clanTag `String` of the clan's tag
+     * @return War
+     * @see War
+     *
+     * @throws IOException if the deserialization failed
+     * @throws ClashAPIException if the request to the game API failed
+     */
+    @Throws(IOException::class, ClashAPIException::class)
+    fun getCurrentWar(clanTag: String): War
+
+    /**
+     * Returns the clan attached to the tag.
+     *
+     * @param clanTag `String` of the clan's tag
+     * @return Clan
+     * @see Clan
+     *
+     * @throws IOException if the deserialization failed
+     * @throws ClashAPIException if the request to the game API failed
+     */
+    @Throws(IOException::class, ClashAPIException::class)
+    fun getClan(clanTag: String): Clan
+    /**
+     * Returns the members of clan attached to the tag.
+     *
+     * @param clanTag `String` of the clan's tag
+     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
+     * @return List<ClanMember>
+     * @see ClanMember
+     *
+     * @throws IOException if the deserialization failed
+     * @throws ClashAPIException if the request to the game API failed
+     */
+    @Throws(IOException::class, ClashAPIException::class)
+    fun getClanMembers(clanTag: String, queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<ClanMember>
+
+    /**
+     * Returns the capital raid seasons of clan attached to the tag.
+     *
+     * @param clanTag `String` of the clan's tag
+     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
+     * @return List<CapitalRaidSeason>
+     * @see CapitalRaidSeason
+     *
+     * @throws IOException if the deserialization failed
+     * @throws ClashAPIException if the request to the game API failed
+     */
+    @Throws(IOException::class, ClashAPIException::class)
+    fun getCapitalRaidSeasons(clanTag: String, queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<CapitalRaidSeason>
+}
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/core/interfaces/IGoldPassAPI.kt b/src/main/java/com/lycoon/clashapi/core/interfaces/IGoldPassAPI.kt
new file mode 100644
index 0000000..dba3318
--- /dev/null
+++ b/src/main/java/com/lycoon/clashapi/core/interfaces/IGoldPassAPI.kt
@@ -0,0 +1,20 @@
+package com.lycoon.clashapi.core.interfaces
+
+import com.lycoon.clashapi.core.exceptions.ClashAPIException
+import com.lycoon.clashapi.models.common.GoldPassSeason
+import java.io.IOException
+
+interface IGoldPassAPI
+{
+    /**
+     * Returns gold pass information
+     *
+     * @return GoldPassSeason
+     * @see GoldPassSeason
+     *
+     * @throws IOException if the deserialization failed
+     * @throws ClashAPIException if the request to the game API failed
+     */
+    @Throws(IOException::class, ClashAPIException::class)
+    fun getGoldPass(): GoldPassSeason
+}
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/core/interfaces/ILabelAPI.kt b/src/main/java/com/lycoon/clashapi/core/interfaces/ILabelAPI.kt
new file mode 100644
index 0000000..2c84b14
--- /dev/null
+++ b/src/main/java/com/lycoon/clashapi/core/interfaces/ILabelAPI.kt
@@ -0,0 +1,35 @@
+package com.lycoon.clashapi.core.interfaces
+
+import com.lycoon.clashapi.core.SimpleQueryParamsBuilder
+import com.lycoon.clashapi.core.exceptions.ClashAPIException
+import com.lycoon.clashapi.models.common.Label
+import java.io.IOException
+
+interface ILabelAPI
+{
+    /**
+     * Returns player labels
+     *
+     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
+     * @return List<Label>
+     * @see Label
+     *
+     * @throws IOException if the deserialization failed
+     * @throws ClashAPIException if the request to the game API failed
+     */
+    @Throws(IOException::class, ClashAPIException::class)
+    fun getPlayerLabels(queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<Label>
+
+    /**
+     * Returns clan labels
+     *
+     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
+     * @return List<Label>
+     * @see Label
+     *
+     * @throws IOException if the deserialization failed
+     * @throws ClashAPIException if the request to the game API failed
+     */
+    @Throws(IOException::class, ClashAPIException::class)
+    fun getClanLabels(queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<Label>
+}
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/core/interfaces/ILeagueAPI.kt b/src/main/java/com/lycoon/clashapi/core/interfaces/ILeagueAPI.kt
new file mode 100644
index 0000000..fab79c4
--- /dev/null
+++ b/src/main/java/com/lycoon/clashapi/core/interfaces/ILeagueAPI.kt
@@ -0,0 +1,151 @@
+package com.lycoon.clashapi.core.interfaces
+
+import com.lycoon.clashapi.core.SimpleQueryParamsBuilder
+import com.lycoon.clashapi.core.exceptions.ClashAPIException
+import com.lycoon.clashapi.models.league.BuilderBaseLeague
+import com.lycoon.clashapi.models.league.CapitalLeague
+import com.lycoon.clashapi.models.league.League
+import com.lycoon.clashapi.models.league.LeagueSeason
+import com.lycoon.clashapi.models.player.PlayerRanking
+import com.lycoon.clashapi.models.warleague.WarLeague
+import java.io.IOException
+
+interface ILeagueAPI
+{
+    /**
+     * Returns all capital leagues from the game.
+     *
+     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
+     * @return List<CapitalLeague>
+     * @see CapitalLeague
+     *
+     * @throws IOException if the deserialization failed
+     * @throws ClashAPIException if the request to the game API failed
+     */
+    @Throws(IOException::class, ClashAPIException::class)
+    fun getCapitalLeagues(queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<CapitalLeague>
+
+    /**
+     * Returns all leagues from the game.
+     *
+     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
+     * @return List<League>
+     * @see League
+     *
+     * @throws IOException if the deserialization failed
+     * @throws ClashAPIException if the request to the game API failed
+     */
+    @Throws(IOException::class, ClashAPIException::class)
+    fun getLeagues(queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<League>
+
+    /**
+     * Returns league season rankings
+     *
+     * @param leagueId `String` of the league id
+     * @param seasonId `String` of the season id
+     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
+     * @return List<PlayerRanking>
+     * @see PlayerRanking
+     *
+     * @throws IOException if the deserialization failed
+     * @throws ClashAPIException if the request to the game API failed
+     */
+    @Throws(IOException::class, ClashAPIException::class)
+    fun getLeagueSeasonRankings(
+            leagueId: String,
+            seasonId: String,
+            queryParamsBuilder: SimpleQueryParamsBuilder? = null
+    ): List<PlayerRanking>
+
+    /**
+     * Returns capital league information
+     *
+     * @param leagueId `String` of the league id
+     * @return CapitalLeague
+     * @see CapitalLeague
+     *
+     * @throws IOException if the deserialization failed
+     * @throws ClashAPIException if the request to the game API failed
+     */
+    @Throws(IOException::class, ClashAPIException::class)
+    fun getCapitalLeague(leagueId: String): CapitalLeague
+
+    /**
+     * Returns builder base league information
+     *
+     * @param leagueId `String` of the league id
+     * @return BuilderBaseLeague
+     * @see BuilderBaseLeague
+     *
+     * @throws IOException if the deserialization failed
+     * @throws ClashAPIException if the request to the game API failed
+     */
+    @Throws(IOException::class, ClashAPIException::class)
+    fun getBuilderBaseLeague(leagueId: String): BuilderBaseLeague
+
+    /**
+     * Returns all builder base leagues from the game.
+     *
+     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
+     * @return List<BuilderBaseLeague>
+     * @see BuilderBaseLeague
+     *
+     * @throws IOException if the deserialization failed
+     * @throws ClashAPIException if the request to the game API failed
+     */
+    @Throws(IOException::class, ClashAPIException::class)
+    fun getBuilderBaseLeagues(queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<BuilderBaseLeague>
+
+    /**
+     * Returns league information
+     *
+     * @param leagueId `String` of the league id
+     * @return League
+     * @see League
+     *
+     * @throws IOException if the deserialization failed
+     * @throws ClashAPIException if the request to the game API failed
+     */
+    @Throws(IOException::class, ClashAPIException::class)
+    fun getLeague(leagueId: String): League
+
+    /**
+     * Returns league seasons
+     *
+     * @param leagueId `String` of the league id
+     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
+     * @return List<LeagueSeason>
+     * @see LeagueSeason
+     *
+     * @throws IOException if the deserialization failed
+     * @throws ClashAPIException if the request to the game API failed
+     */
+    @Throws(IOException::class, ClashAPIException::class)
+    fun getLeagueSeasons(leagueId: String, queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<LeagueSeason>
+
+    /**
+     * Returns warleague information
+     *
+     * @param leagueId `String` of the league id
+     * @return WarLeague
+     * @see WarLeague
+     *
+     * @throws IOException if the deserialization failed
+     * @throws ClashAPIException if the request to the game API failed
+     */
+    @Throws(IOException::class, ClashAPIException::class)
+    fun getWarLeague(leagueId: String): WarLeague
+
+    /**
+     * Returns all warleagues
+     *
+     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
+     * @return List<WarLeague>
+     * @see WarLeague
+     *
+     * @throws IOException if the deserialization failed
+     * @throws ClashAPIException if the request to the game API failed
+     */
+    @Throws(IOException::class, ClashAPIException::class)
+    fun getWarLeagues(queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<WarLeague>
+}
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/core/interfaces/ILocationAPI.kt b/src/main/java/com/lycoon/clashapi/core/interfaces/ILocationAPI.kt
new file mode 100644
index 0000000..33c1d6a
--- /dev/null
+++ b/src/main/java/com/lycoon/clashapi/core/interfaces/ILocationAPI.kt
@@ -0,0 +1,140 @@
+package com.lycoon.clashapi.core.interfaces
+
+import com.lycoon.clashapi.core.SimpleQueryParamsBuilder
+import com.lycoon.clashapi.core.exceptions.ClashAPIException
+import com.lycoon.clashapi.models.capital.CapitalRanking
+import com.lycoon.clashapi.models.clan.ClanBuilderBaseRanking
+import com.lycoon.clashapi.models.clan.ClanRanking
+import com.lycoon.clashapi.models.common.Location
+import com.lycoon.clashapi.models.player.PlayerBuilderBaseRanking
+import com.lycoon.clashapi.models.player.PlayerRanking
+import java.io.IOException
+
+interface ILocationAPI
+{
+    /**
+     * Returns clan rankings for a specific location
+     *
+     * @param locationId `String` of the location id
+     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
+     * @return List<ClanRanking>
+     * @see ClanRanking
+     *
+     * @throws IOException if the deserialization failed
+     * @throws ClashAPIException if the request to the game API failed
+     */
+    @Throws(IOException::class, ClashAPIException::class)
+    fun getClanRankings(locationId: String, queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<ClanRanking>
+
+    /**
+     * Returns player rankings for a specific location
+     *
+     * @param locationId `String` of the location id
+     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
+     * @return List<PlayerRanking>
+     * @see PlayerRanking
+     *
+     * @throws IOException if the deserialization failed
+     * @throws ClashAPIException if the request to the game API failed
+     */
+    @Throws(IOException::class, ClashAPIException::class)
+    fun getPlayerRankings(locationId: String, queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<PlayerRanking>
+
+    /**
+     * Returns clan builder base rankings for a specific location
+     *
+     * @param locationId `String` of the location id
+     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
+     * @return List<ClanBuilderBaseRanking>
+     * @see ClanBuilderBaseRanking
+     *
+     * @throws IOException if the deserialization failed
+     * @throws ClashAPIException if the request to the game API failed
+     */
+    @Throws(IOException::class, ClashAPIException::class)
+    fun getClanBuilderBaseRankings(locationId: String, queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<ClanBuilderBaseRanking>
+
+    /**
+     * Returns clan versus rankings for a specific location
+     *
+     * @param locationId `String` of the location id
+     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
+     * @return List<ClanBuilderBaseRanking>
+     * @see ClanBuilderBaseRanking
+     *
+     * @throws IOException if the deserialization failed
+     * @throws ClashAPIException if the request to the game API failed
+     */
+    @Deprecated("Use getClanBuilderBaseRankings instead")
+    @Throws(IOException::class, ClashAPIException::class)
+    fun getClanVersusRankings(locationId: String, queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<ClanBuilderBaseRanking>
+
+    /**
+     * Returns player builder base rankings for a specific location
+     *
+     * @param locationId `String` of the location id
+     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
+     * @return List<PlayerBuilderBaseRanking>
+     * @see PlayerBuilderBaseRanking
+     *
+     * @throws IOException if the deserialization failed
+     * @throws ClashAPIException if the request to the game API failed
+     */
+    @Throws(IOException::class, ClashAPIException::class)
+    fun getPlayerBuilderBaseRankings(locationId: String, queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<PlayerBuilderBaseRanking>
+
+    /**
+     * Returns player versus rankings for a specific location
+     *
+     * @param locationId `String` of the location id
+     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
+     * @return List<PlayerBuilderBaseRanking>
+     * @see PlayerBuilderBaseRanking
+     *
+     * @throws IOException if the deserialization failed
+     * @throws ClashAPIException if the request to the game API failed
+     */
+    @Deprecated("Use getPlayerBuilderBaseRankings instead")
+    @Throws(IOException::class, ClashAPIException::class)
+    fun getPlayerVersusRankings(locationId: String, queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<PlayerBuilderBaseRanking>
+
+    /**
+     * Returns locations
+     *
+     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
+     * @return List<Location>
+     * @see Location
+     *
+     * @throws IOException if the deserialization failed
+     * @throws ClashAPIException if the request to the game API failed
+     */
+    @Throws(IOException::class, ClashAPIException::class)
+    fun getLocations(queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<Location>
+
+    /**
+     * Returns capital rankings for a specific location
+     *
+     * @param locationId `String` of the location id
+     * @param queryParamsBuilder (optional) `SimpleQueryParamsBuilder` to build the query parameters
+     * @return List<ClanCapitalRanking>
+     * @see CapitalRanking
+     *
+     * @throws IOException if the deserialization failed
+     * @throws ClashAPIException if the request to the game API failed
+     */
+    @Throws(IOException::class, ClashAPIException::class)
+    fun getCapitalRankings(locationId: String, queryParamsBuilder: SimpleQueryParamsBuilder? = null): List<CapitalRanking>
+
+    /**
+     * Returns specific location information
+     *
+     * @param locationId `String` of the location id
+     * @return Location
+     * @see Location
+     *
+     * @throws IOException if the deserialization failed
+     * @throws ClashAPIException if the request to the game API failed
+     */
+    @Throws(IOException::class, ClashAPIException::class)
+    fun getLocation(locationId: String): Location
+}
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/core/interfaces/IPlayerAPI.kt b/src/main/java/com/lycoon/clashapi/core/interfaces/IPlayerAPI.kt
new file mode 100644
index 0000000..a457ee5
--- /dev/null
+++ b/src/main/java/com/lycoon/clashapi/core/interfaces/IPlayerAPI.kt
@@ -0,0 +1,34 @@
+package com.lycoon.clashapi.core.interfaces
+
+import com.lycoon.clashapi.core.exceptions.ClashAPIException
+import com.lycoon.clashapi.models.player.Player
+import java.io.IOException
+
+interface IPlayerAPI
+{
+    /**
+     * Returns the player attached to the tag.
+     *
+     * @param playerTag `String` of the player's tag
+     * @return Player
+     * @see Player
+     *
+     * @throws IOException if the deserialization failed
+     * @throws ClashAPIException if the request to the game API failed
+     */
+    @Throws(IOException::class, ClashAPIException::class)
+    fun getPlayer(playerTag: String): Player
+
+    /**
+     * Returns whether the given player tag is verified or not.
+     *
+     * @param playerTag `String` of the player's tag
+     * @param token `String` of the player token
+     * @return a boolean
+     *
+     * @throws IOException if the deserialization failed
+     * @throws ClashAPIException if the request to the game API failed
+     */
+    @Throws(IOException::class, ClashAPIException::class)
+    fun isVerifiedPlayer(playerTag: String, token: String): Boolean
+}
\ No newline at end of file
diff --git a/src/test/java/ClashAPITest.kt b/src/test/java/ClashAPITest.kt
index 9a44f68..b9ed6e2 100644
--- a/src/test/java/ClashAPITest.kt
+++ b/src/test/java/ClashAPITest.kt
@@ -1,19 +1,9 @@
 import com.lycoon.clashapi.core.ClanQueryParamsBuilder
 import junit.framework.TestCase
 import com.lycoon.clashapi.core.ClashAPI
-import com.lycoon.clashapi.core.CoreUtils
-import com.lycoon.clashapi.core.SimpleQueryParamsBuilder
 import java.io.FileInputStream
 import java.io.IOException
-import com.lycoon.clashapi.core.exception.NotFoundException
-import kotlinx.serialization.*
-import kotlinx.serialization.descriptors.PrimitiveKind
-import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
-import kotlinx.serialization.descriptors.SerialDescriptor
-import kotlinx.serialization.descriptors.buildClassSerialDescriptor
-import kotlinx.serialization.encoding.Decoder
-import kotlinx.serialization.encoding.Encoder
-import kotlinx.serialization.encoding.decodeStructure
+import com.lycoon.clashapi.core.exceptions.NotFoundException
 import java.util.*
 
 const val CLAN_TAG = "UPCU2098"

From 3155a130d7819014827ef6e2dde311fcf67a3881 Mon Sep 17 00:00:00 2001
From: Hugo Bois <hugo.bois@hotmail.fr>
Date: Wed, 22 Nov 2023 21:22:36 +0100
Subject: [PATCH 7/7] chore: fixed more serialization errors

---
 .../com/lycoon/clashapi/core/QueryBuilder.kt  | 16 ++++++++--------
 .../com/lycoon/clashapi/models/clan/Clan.kt   |  2 +-
 .../com/lycoon/clashapi/models/war/War.kt     | 14 +++++---------
 .../com/lycoon/clashapi/models/war/WarClan.kt | 11 ++++++-----
 .../lycoon/clashapi/models/war/WarMember.kt   |  2 +-
 .../clashapi/models/war/enums/WarState.kt     | 19 +++++++++++++++++++
 6 files changed, 40 insertions(+), 24 deletions(-)
 create mode 100644 src/main/java/com/lycoon/clashapi/models/war/enums/WarState.kt

diff --git a/src/main/java/com/lycoon/clashapi/core/QueryBuilder.kt b/src/main/java/com/lycoon/clashapi/core/QueryBuilder.kt
index 4cac007..f77c8a1 100644
--- a/src/main/java/com/lycoon/clashapi/core/QueryBuilder.kt
+++ b/src/main/java/com/lycoon/clashapi/core/QueryBuilder.kt
@@ -31,14 +31,14 @@ class ClanQueryParamsBuilder(
     override val limit: Int?     = null,
     override val after: String?  = null,
     override val before: String? = null,
-    val name: String?           = null,
-    val warFrequency: String?   = null,
-    val locationId: Int?        = null,
-    val minMembers: Int?        = null,
-    val maxMembers: Int?        = null,
-    val minClanPoints: Int?     = null,
-    val minClanLevel: Int?      = null,
-    val labelIds: String?       = null
+    val name: String?            = null,
+    val warFrequency: String?    = null,
+    val locationId: Int?         = null,
+    val minMembers: Int?         = null,
+    val maxMembers: Int?         = null,
+    val minClanPoints: Int?      = null,
+    val minClanLevel: Int?       = null,
+    val labelIds: String?        = null
 ) : QueryParamsBuilder(limit, after, before)
 {
     override fun build(): String
diff --git a/src/main/java/com/lycoon/clashapi/models/clan/Clan.kt b/src/main/java/com/lycoon/clashapi/models/clan/Clan.kt
index 744ff26..98098b4 100644
--- a/src/main/java/com/lycoon/clashapi/models/clan/Clan.kt
+++ b/src/main/java/com/lycoon/clashapi/models/clan/Clan.kt
@@ -31,7 +31,7 @@ data class Clan
     val location: Location? = null,           // nullable when using clan search
     val badgeUrls: BadgeUrls,
     val members: Int = 0,
-    val memberList: List<ClanMember>? = null, // nullable when using clan search
+    val memberList: List<ClanMember> = emptyList(), // nullable when using clan search
 
     @Deprecated("Use requiredBuilderBaseTrophies instead")
     val requiredVersusTrophies: Int = 0,
diff --git a/src/main/java/com/lycoon/clashapi/models/war/War.kt b/src/main/java/com/lycoon/clashapi/models/war/War.kt
index 62a74c2..848c3fb 100644
--- a/src/main/java/com/lycoon/clashapi/models/war/War.kt
+++ b/src/main/java/com/lycoon/clashapi/models/war/War.kt
@@ -1,21 +1,17 @@
 package com.lycoon.clashapi.models.war
 
+import com.lycoon.clashapi.models.war.enums.WarState
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class War(
+data class War
+    (
     val clan: WarClan? = null, // if warTag from warleague is #0 (not found)
     val teamSize: Int = 0, // if clan is not in war
     val attacksPerMember: Int = 0, // if from a warleague round war
     val opponent: WarClan? = null, // if warTag from warleague is #0 (not found)
     val startTime: String? = null, // if warTag from warleague is #0 (not found)
-    val state: State,
+    val state: WarState,
     val endTime: String? = null, // if warTag from warleague is #0 (not found)
     val preparationStartTime: String? = null // if warTag from warleague is #0 (not found)
-) {
-    enum class State {
-        CLAN_NOT_FOUND, ACCESS_DENIED, NOT_IN_WAR,
-        IN_MATCHMAKING, ENTER_WAR, MATCHED, PREPARATION,
-        WAR, IN_WAR, ENDED
-    }
-}
\ No newline at end of file
+)
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/war/WarClan.kt b/src/main/java/com/lycoon/clashapi/models/war/WarClan.kt
index d9ea63f..79de0ae 100644
--- a/src/main/java/com/lycoon/clashapi/models/war/WarClan.kt
+++ b/src/main/java/com/lycoon/clashapi/models/war/WarClan.kt
@@ -4,14 +4,15 @@ import com.lycoon.clashapi.models.common.BadgeUrls
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class WarClan(
+data class WarClan
+(
     val destructionPercentage: Float = 0f,
-    val tag: String? = null, // if clan is not in war
-    val name: String? = null, // if clan is not in war
+    val tag: String? = null,                        // if clan is not in war
+    val name: String? = null,                       // if clan is not in war
     val badgeUrls: BadgeUrls? = null,
     val clanLevel: Int = 0,
     val attacks: Int = 0,
     val stars: Int = 0,
-    val expEarned: Int = 0, // if from a warleague round war
-    val members: List<WarMember>?, // if clan is not in war
+    val expEarned: Int = 0,                         // if from a war league round war
+    val members: List<WarMember> = emptyList(),     // if clan is not in war
 )
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/war/WarMember.kt b/src/main/java/com/lycoon/clashapi/models/war/WarMember.kt
index f418446..83cc194 100644
--- a/src/main/java/com/lycoon/clashapi/models/war/WarMember.kt
+++ b/src/main/java/com/lycoon/clashapi/models/war/WarMember.kt
@@ -10,5 +10,5 @@ data class WarMember(
     val townhallLevel: Int = 0,
     val opponentAttacks: Int = 0,
     val bestOpponentAttack: WarAttack? = null,
-    val attacks: List<WarAttack>?
+    val attacks: List<WarAttack> = emptyList()
 )
\ No newline at end of file
diff --git a/src/main/java/com/lycoon/clashapi/models/war/enums/WarState.kt b/src/main/java/com/lycoon/clashapi/models/war/enums/WarState.kt
new file mode 100644
index 0000000..6911c23
--- /dev/null
+++ b/src/main/java/com/lycoon/clashapi/models/war/enums/WarState.kt
@@ -0,0 +1,19 @@
+package com.lycoon.clashapi.models.war.enums
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+enum class WarState
+{
+    @SerialName("clanNotFound") CLAN_NOT_FOUND,
+    @SerialName("accessDenied") ACCESS_DENIED,
+    @SerialName("notInWar") NOT_IN_WAR,
+    @SerialName("inMatchmaking") IN_MATCHMAKING,
+    @SerialName("enterWar") ENTER_WAR,
+    @SerialName("matched") MATCHED,
+    @SerialName("preparation") PREPARATION,
+    @SerialName("war") WAR,
+    @SerialName("inWar") IN_WAR,
+    @SerialName("ended") ENDED
+}
\ No newline at end of file