diff options
Diffstat (limited to 'src/main/java')
92 files changed, 454 insertions, 718 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/data/FameRanks.kt b/src/main/java/at/hannibal2/skyhanni/data/FameRanks.kt index db922ada8..750f12943 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/FameRanks.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/FameRanks.kt @@ -15,7 +15,7 @@ object FameRanks { @SubscribeEvent fun onRepoReload(event: RepositoryReloadEvent) { val ranks = event.getConstant<FameRankJson>("FameRank") - fameRanks = ranks.fame_rank.values.map { FameRank(it.name, it.fame_required, it.bits_multiplier, it.votes) } + fameRanks = ranks.fameRank.values.map { FameRank(it.name, it.fameRequired, it.bitsMultiplier, it.votes) } .associateBy { it.name } } } diff --git a/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestones.kt b/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestones.kt index af9744629..2195efb99 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestones.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestones.kt @@ -181,6 +181,6 @@ object GardenCropMilestones { @SubscribeEvent fun onRepoReload(event: RepositoryReloadEvent) { - cropMilestoneData = event.getConstant<GardenJson>("Garden").crop_milestones + cropMilestoneData = event.getConstant<GardenJson>("Garden").cropMilestones } } diff --git a/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestonesCommunityFix.kt b/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestonesCommunityFix.kt index ec874880a..cd6523f26 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestonesCommunityFix.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestonesCommunityFix.kt @@ -39,7 +39,7 @@ object GardenCropMilestonesCommunityFix { @SubscribeEvent fun onRepoReload(event: RepositoryReloadEvent) { val data = event.getConstant<GardenJson>("Garden") - val map = data.crop_milestone_community_help ?: return + val map = data.cropMilestoneCommunityHelp for ((key, value) in map) { if (key == "show_wrong_data") { showWrongData = value diff --git a/src/main/java/at/hannibal2/skyhanni/data/LocationFixData.kt b/src/main/java/at/hannibal2/skyhanni/data/LocationFixData.kt index f3a25a494..129e1cd95 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/LocationFixData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/LocationFixData.kt @@ -22,9 +22,9 @@ object LocationFixData { locationFixes.clear() for (fix in data.locationFixes.values) { - val island = IslandType.getByName(fix.island_name) + val island = IslandType.getByName(fix.islandName) val area = fix.a.axisAlignedTo(fix.b) - val realLocation = fix.real_location + val realLocation = fix.realLocation locationFixes.add(LocationFix(island, area, realLocation)) } diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/AnitaUpgradeCostsJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/AnitaUpgradeCostsJson.java deleted file mode 100644 index a1122eec3..000000000 --- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/AnitaUpgradeCostsJson.java +++ /dev/null @@ -1,18 +0,0 @@ -package at.hannibal2.skyhanni.data.jsonobjects.repo; - -import com.google.gson.annotations.Expose; - -import java.util.Map; - -public class AnitaUpgradeCostsJson { - @Expose - public Map<Integer, Price> level_price; - - public static class Price { - @Expose - public Integer gold_medals; - - @Expose - public Integer jacob_tickets; - } -} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/AnitaUpgradeCostsJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/AnitaUpgradeCostsJson.kt new file mode 100644 index 000000000..b2b688cf8 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/AnitaUpgradeCostsJson.kt @@ -0,0 +1,13 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo + +import com.google.gson.annotations.Expose +import com.google.gson.annotations.SerializedName + +data class AnitaUpgradeCostsJson( + @Expose @SerializedName("level_price") val levelPrice: Map<Int, AnitaUpgradePrice> +) + +data class AnitaUpgradePrice( + @Expose @SerializedName("gold_medals") val goldMedals: Int, + @Expose @SerializedName("jacob_tickets") val jacobTickets: Int +) diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ArmorDropsJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ArmorDropsJson.java deleted file mode 100644 index c8038c49f..000000000 --- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ArmorDropsJson.java +++ /dev/null @@ -1,19 +0,0 @@ -package at.hannibal2.skyhanni.data.jsonobjects.repo; - -import com.google.gson.annotations.Expose; - -import java.util.List; -import java.util.Map; - -public class ArmorDropsJson { - @Expose - public Map<String, DropInfo> special_crops; - - publi |