diff options
| author | appable <enzospiacitelli@gmail.com> | 2024-06-03 11:04:22 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-03 20:04:22 +0200 |
| commit | fa524e03723906c5fda6073b6ff289af4742b6b6 (patch) | |
| tree | 15767fa83597197af2071e549a3d75783ceae41a /src/main/java/at/hannibal2/skyhanni/data/jsonobjects | |
| parent | 6dc2637814aec37e1312d4f9a18ec70f58b938b1 (diff) | |
| download | skyhanni-fa524e03723906c5fda6073b6ff289af4742b6b6.tar.gz skyhanni-fa524e03723906c5fda6073b6ff289af4742b6b6.tar.bz2 skyhanni-fa524e03723906c5fda6073b6ff289af4742b6b6.zip | |
Improvement: import egg locations from NEU PV (#1972)
Co-authored-by: Cal <cwolfson58@gmail.com>
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/data/jsonobjects')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/data/jsonobjects/other/HypixelPlayerApiJson.kt | 17 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/HoppityEggLocationsJson.kt | 1 |
2 files changed, 17 insertions, 1 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/other/HypixelPlayerApiJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/other/HypixelPlayerApiJson.kt index 0a18ca28e..47304433a 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/other/HypixelPlayerApiJson.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/other/HypixelPlayerApiJson.kt @@ -2,6 +2,7 @@ package at.hannibal2.skyhanni.data.jsonobjects.other import com.google.gson.annotations.Expose import com.google.gson.annotations.SerializedName +import javax.annotation.Nullable data class HypixelPlayerApiJson( @Expose val profiles: List<HypixelApiProfile> @@ -13,7 +14,21 @@ data class HypixelApiProfile( ) data class HypixelApiPlayer( - @Expose @SerializedName("trophy_fish") val trophyFish: HypixelApiTrophyFish + @Expose @SerializedName("trophy_fish") val trophyFish: HypixelApiTrophyFish, + @Expose val events: HypixelApiEvents +) + +data class HypixelApiEvents( + @Expose val easter: HypixelApiEasterEvent +) + +data class HypixelApiEasterEvent( + @Expose val rabbits: HypixelApiRabbits +) + +data class HypixelApiRabbits( + @Expose @SerializedName("collected_locations") + val collectedLocations: Map<String, List<String>> ) data class HypixelApiTrophyFish( diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/HoppityEggLocationsJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/HoppityEggLocationsJson.kt index 82eadbd18..d83d66249 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/HoppityEggLocationsJson.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/HoppityEggLocationsJson.kt @@ -21,5 +21,6 @@ data class HoppityEggLocationsJson( @Expose val coachRabbitIndex: Int, @Expose val maxRabbits: Int, @Expose val maxPrestige: Int, + @Expose val apiEggLocations: Map<IslandType, Map<String, LorenzVec>>, @Expose val specialRabbits: List<String>, ) |