diff options
| author | CalMWolfs <94038482+CalMWolfs@users.noreply.github.com> | 2024-06-07 22:10:11 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-07 14:10:11 +0200 |
| commit | 79d0cd3af5b2acf11fc63bc3aa6743f784a3a0f6 (patch) | |
| tree | 9a8507e4d7fe308dd4a228149f5a864301cfcce9 | |
| parent | cfb12e7e3bbaf820f9402c286cba6bb0a33671fa (diff) | |
| download | skyhanni-79d0cd3af5b2acf11fc63bc3aa6743f784a3a0f6.tar.gz skyhanni-79d0cd3af5b2acf11fc63bc3aa6743f784a3a0f6.tar.bz2 skyhanni-79d0cd3af5b2acf11fc63bc3aa6743f784a3a0f6.zip | |
Backend: Change Java to Kotlin for repo files (#1543)
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; - - public static class DropInfo { - @Expose - public String armor_type; - - @Expose - public List<Double> chance; - } -} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ArmorDropsJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ArmorDropsJson.kt new file mode 100644 index 000000000..5aebcd2ba --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ArmorDropsJson.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 ArmorDropsJson( + @Expose @SerializedName("special_crops") val specialCrops: Map<String, ArmorDropInfo> +) + +data class ArmorDropInfo( + @Expose @SerializedName("armor_type") val armorType: String, + @Expose val chance: List<Double> +) diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ArrowTypeJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ArrowTypeJson.java deleted file mode 100644 index 4173fa0a3..000000000 --- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ArrowTypeJson.java +++ /dev/null @@ -1,15 +0,0 @@ -package at.hannibal2.skyhanni.data.jsonobjects.repo; - -import com.google.gson.annotations.Expose; - -import java.util.Map; - -public class ArrowTypeJson { - @Expose - public Map<String, ArrowAttributes> arrows; - - public static class ArrowAttributes { - @Expose - public String arrow; - } -} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ArrowTypeJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ArrowTypeJson.kt new file mode 100644 index 000000000..2ce05c838 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ArrowTypeJson.kt @@ -0,0 +1,11 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo + +import com.google.gson.annotations.Expose + +data class ArrowTypeJson( + @Expose val arrows: Map<String, ArrowAttributes> +) + +data class ArrowAttributes( + @Expose val arrow: String +) diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/BeltsJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/BeltsJson.java deleted file mode 100644 index 15aadc2d4..000000000 --- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/BeltsJson.java +++ /dev/null @@ -1,10 +0,0 @@ -package at.hannibal2.skyhanni.data.jsonobjects.repo; - -import com.google.gson.annotations.Expose; - -import java.util.Map; - -public class BeltsJson { - @Expose - public Map<String, Integer> belts; -} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/BeltsJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/BeltsJson.kt new file mode 100644 index 000000000..16eac4626 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/BeltsJson.kt @@ -0,0 +1,7 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo + +import com.google.gson.annotations.Expose + +data class BeltsJson( + @Expose val belts: Map<String, Int> +) diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/BingoJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/BingoJson.java deleted file mode 100644 index f9e8406eb..000000000 --- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/BingoJson.java +++ /dev/null @@ -1,25 +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 BingoJson { - @Expose - public Map<String, BingoData> bingo_tips; - - public static class BingoData { - @Expose - public String difficulty; - - @Expose - public List<String> note; - - @Expose - public List<String> guide; - - @Expose - public String found; - } -} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/BingoJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/BingoJson.kt new file mode 100644 index 000000000..890a9838e --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/BingoJson.kt @@ -0,0 +1,15 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo + +import com.google.gson.annotations.Expose +import com.google.gson.annotations.SerializedName + +data class BingoJson( + @Expose @SerializedName("bingo_tips") val bingoTips: Map<String, BingoData> +) + +data class BingoData( + @Expose val difficulty: String, + @Expose val note: List<String>, + @Expose val guide: List<String>, + @Expose val found: String +) diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/BingoRanksJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/BingoRanksJson.java deleted file mode 100644 index 98f2a4695..000000000 --- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/BingoRanksJson.java +++ /dev/null @@ -1,10 +0,0 @@ -package at.hannibal2.skyhanni.data.jsonobjects.repo; - -import com.google.gson.annotations.Expose; - -import java.util.Map; - -public class BingoRanksJson { - @Expose - public Map<String, Integer> ranks; -} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/BingoRanksJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/BingoRanksJson.kt new file mode 100644 index 000000000..c24285343 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/BingoRanksJson.kt @@ -0,0 +1,7 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo + +import com.google.gson.annotations.Expose + +data class BingoRanksJson( + @Expose val ranks: Map<String, Int> +) diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/CrimsonIsleReputationJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/CrimsonIsleReputationJson.java deleted file mode 100644 index 0ab0e52ff..000000000 --- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/CrimsonIsleReputationJson.java +++ /dev/null @@ -1,35 +0,0 @@ -package at.hannibal2.skyhanni.data.jsonobjects.repo; - -import at.hannibal2.skyhanni.utils.NEUInternalName; -import com.google.gson.annotations.Expose; - -import java.util.List; -import java.util.Map; - -public class CrimsonIsleReputationJson { - @Expose - public Map<String, ReputationQuest> FISHING; - - @Expose - public Map<String, ReputationQuest> RESCUE; - - @Expose - public Map<String, ReputationQuest> FETCH; - - @Expose - public Map<String, ReputationQuest> DOJO; - - @Expose - public Map<String, ReputationQuest> MINIBOSS; - - @Expose - public Map<String, ReputationQuest> KUUDRA; - - public static class ReputationQuest { - @Expose - public NEUInternalName item; - - @Expose - public List<Double> location; - } -} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/CrimsonIsleReputationJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/CrimsonIsleReputationJson.kt new file mode 100644 index 000000000..f25d6040c --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/CrimsonIsleReputationJson.kt @@ -0,0 +1,18 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo + +import at.hannibal2.skyhanni.utils.NEUInternalName +import com.google.gson.annotations.Expose + +data class CrimsonIsleReputationJson( + @Expose val FISHING: Map<String, ReputationQuest>, + @Expose val RESCUE: Map<String, ReputationQuest>, + @Expose val FETCH: Map<String, ReputationQuest>, + @Expose val DOJO: Map<String, ReputationQuest>, + @Expose val MINIBOSS: Map<String, ReputationQuest>, + @Expose val KUUDRA: Map<String, ReputationQuest>, +) + +data class ReputationQuest( + @Expose val item: NEUInternalName, + @Expose val location: List<Double> +) diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DanceRoomInstructionsJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DanceRoomInstructionsJson.java deleted file mode 100644 index e7c167e53..000000000 --- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DanceRoomInstructionsJson.java +++ /dev/null @@ -1,10 +0,0 @@ -package at.hannibal2.skyhanni.data.jsonobjects.repo; - -import com.google.gson.annotations.Expose; - -import java.util.List; - -public class DanceRoomInstructionsJson { - @Expose - public List<String> instructions; -} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DanceRoomInstructionsJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DanceRoomInstructionsJson.kt new file mode 100644 index 000000000..2c34478c6 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DanceRoomInstructionsJson.kt @@ -0,0 +1,7 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo + +import com.google.gson.annotations.Expose + +data class DanceRoomInstructionsJson( + @Expose val instructions: List<String> +) diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DianaDrops.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DianaDrops.java deleted file mode 100644 index 050601c3d..000000000 --- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DianaDrops.java +++ /dev/null @@ -1,11 +0,0 @@ -package at.hannibal2.skyhanni.data.jsonobjects.repo; - -import at.hannibal2.skyhanni.utils.NEUInternalName; -import com.google.gson.annotations.Expose; - -import java.util.List; - -public class DianaDrops { - @Expose - public List<NEUInternalName> diana_drops; -} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DianaDropsJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DianaDropsJson.kt new file mode 100644 index 000000000..df515e14d --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DianaDropsJson.kt @@ -0,0 +1,9 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo + +import at.hannibal2.skyhanni.utils.NEUInternalName +import com.google.gson.annotations.Expose +import com.google.gson.annotations.SerializedName + +data class DianaDropsJson( + @Expose @SerializedName("diana_drops") val dianaDrops: List<NEUInternalName> +) diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DicerDropsJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DicerDropsJson.java deleted file mode 100644 index 00a662768..000000000 --- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DicerDropsJson.java +++ /dev/null @@ -1,31 +0,0 @@ -package at.hannibal2.skyhanni.data.jsonobjects.repo; - -import com.google.gson.annotations.Expose; -import com.google.gson.annotations.SerializedName; - -import java.util.List; - -public class DicerDropsJson { - @Expose - public DicerType MELON; - - @Expose - public DicerType PUMPKIN; - - public static class DicerType { - @Expose - @SerializedName("total chance") - public Integer totalChance; - - @Expose - public List<DropInfo> drops; - } - - public static class DropInfo { - @Expose - public Integer chance; - - @Expose - public List<Integer> amount; - } -} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DicerDropsJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DicerDropsJson.kt new file mode 100644 index 000000000..86cd684b8 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DicerDropsJson.kt @@ -0,0 +1,19 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo + +import com.google.gson.annotations.Expose +import com.google.gson.annotations.SerializedName + +class DicerDropsJson( + @Expose val MELON: DicerType, + @Expose val PUMPKIN: DicerType +) + +data class DicerType( + @Expose @SerializedName("total chance") val totalChance: Int, + @Expose val drops: List<DropInfo> +) + +data class DropInfo( + @Expose val chance: Int, + @Expose val amount: List<Int> +) diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DisabledFeaturesJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DisabledFeaturesJson.java deleted file mode 100644 index 1099cf782..000000000 --- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DisabledFeaturesJson.java +++ /dev/null @@ -1,10 +0,0 @@ -package at.hannibal2.skyhanni.data.jsonobjects.repo; - -import com.google.gson.annotations.Expose; - -import java.util.Map; - -public class DisabledFeaturesJson { - @Expose - public Map<String, Boolean> features; -} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DisabledFeaturesJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DisabledFeaturesJson.kt new file mode 100644 index 000000000..bcc4753ac --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DisabledFeaturesJson.kt @@ -0,0 +1,7 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo + +import com.google.gson.annotations.Expose + +data class DisabledFeaturesJson( + @Expose val features: Map<String, Boolean> +) diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/EnigmaSoulsJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/EnigmaSoulsJson.java deleted file mode 100644 index cd17d1744..000000000 --- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/EnigmaSoulsJson.java +++ /dev/null @@ -1,20 +0,0 @@ -package at.hannibal2.skyhanni.data.jsonobjects.repo; - -import at.hannibal2.skyhanni.utils.LorenzVec; -import com.google.gson.annotations.Expose; - -import java.util.List; -import java.util.Map; - -public class EnigmaSoulsJson { - @Expose - public Map<String, List<EnigmaPosition>> areas; - - public static class EnigmaPosition { - @Expose - public String name; - - @Expose - public LorenzVec position; - } -} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/EnigmaSoulsJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/EnigmaSoulsJson.kt new file mode 100644 index 000000000..a458f04ae --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/EnigmaSoulsJson.kt @@ -0,0 +1,13 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo + +import at.hannibal2.skyhanni.utils.LorenzVec +import com.google.gson.annotations.Expose + +data class EnigmaSoulsJson( + @Expose val areas: Map<String, List<EnigmaPosition>> +) + +data class EnigmaPosition( + @Expose val name: String, + @Expose val position: LorenzVec +) diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/EventWaypointsJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/EventWaypointsJson.java deleted file mode 100644 index f59af9ffb..000000000 --- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/EventWaypointsJson.java +++ /dev/null @@ -1,25 +0,0 @@ -package at.hannibal2.skyhanni.data.jsonobjects.repo; - -import at.hannibal2.skyhanni.utils.LorenzVec; -import com.google.gson.annotations.Expose; - -import java.util.List; -import java.util.Map; - -public class EventWaypointsJson { - - @Expose - public Map<String, List<Waypoint>> presents; - - @Expose - public Map<String, List<Waypoint>> presents_entrances; - - public static class Waypoint { - @Expose - public String name; - - //format: "x:y:z" - @Expose - public LorenzVec position; - } -} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/EventWaypointsJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/EventWaypointsJson.kt new file mode 100644 index 000000000..b5548ef1e --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/EventWaypointsJson.kt @@ -0,0 +1,15 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo + +import at.hannibal2.skyhanni.utils.LorenzVec +import com.google.gson.annotations.Expose +import com.google.gson.annotations.SerializedName + +data class EventWaypointsJson( + @Expose val presents: Map<String, List<EventWaypointData>>, + @Expose @SerializedName("presents_entrances") val presentsEntrances: Map<String, List<EventWaypointData>> +) + +data class EventWaypointData( + @Expose val name: String, + @Expose val position: LorenzVec +) diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/FameRankJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/FameRankJson.java deleted file mode 100644 index e060d55d1..000000000 --- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/FameRankJson.java +++ /dev/null @@ -1,24 +0,0 @@ -package at.hannibal2.skyhanni.data.jsonobjects.repo; - -import com.google.gson.annotations.Expose; - -import java.util.Map; - -public class FameRankJson { - @Expose - public Map<String, FameRank> fame_rank; - - public static class FameRank { - @Expose - public String name; - - @Expose - public int fame_required; - - @Expose - public double bits_multiplier; - - @Expose - public int votes; - } -} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/FameRankJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/FameRankJson.kt new file mode 100644 index 000000000..b5d9dddcc --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/FameRankJson.kt @@ -0,0 +1,15 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo + +import com.google.gson.annotations.Expose +import com.google.gson.annotations.SerializedName + +data class FameRankJson( + @Expose @SerializedName("fame_rank") val fameRank: Map<String, FameRank> +) + +data class FameRank( + @Expose val name: String, + @Expose @SerializedName("fame_required") val fameRequired: Int, + @Expose @SerializedName("bits_multiplier") val bitsMultiplier: Double, + @Expose val votes: Int +) diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/FishingProfitItemsJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/FishingProfitItemsJson.java deleted file mode 100644 index 47f7fc0bb..000000000 --- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/FishingProfitItemsJson.java +++ /dev/null @@ -1,12 +0,0 @@ -package at.hannibal2.skyhanni.data.jsonobjects.repo; - -import at.hannibal2.skyhanni.utils.NEUInternalName; -import com.google.gson.annotations.Expose; - -import java.util.List; -import java.util.Map; - -public class FishingProfitItemsJson { - @Expose - public Map<String, List<NEUInternalName>> categories; -} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/FishingProfitItemsJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/FishingProfitItemsJson.kt new file mode 100644 index 000000000..224cc7f4d --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/FishingProfitItemsJson.kt @@ -0,0 +1,8 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo + +import at.hannibal2.skyhanni.utils.NEUInternalName +import com.google.gson.annotations.Expose + +data class FishingProfitItemsJson( + @Expose val categories: Map<String, List<NEUInternalName>> +) diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/GardenJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/GardenJson.java deleted file mode 100644 index dd00add03..000000000 --- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/GardenJson.java +++ /dev/null @@ -1,59 +0,0 @@ -package at.hannibal2.skyhanni.data.jsonobjects.repo; - -import at.hannibal2.skyhanni.features.garden.CropType; -import at.hannibal2.skyhanni.utils.LorenzRarity; -import at.hannibal2.skyhanni.utils.LorenzVec; -import at.hannibal2.skyhanni.utils.NEUInternalName; -import com.google.gson.annotations.Expose; -import org.jetbrains.annotations.Nullable; - -import java.util.List; -import java.util.Map; - -public class GardenJson { - @Expose - public List<Integer> garden_exp; - - @Expose - public Map<CropType, List<Integer>> crop_milestones; - - @Expose - public Map<String, Boolean> crop_milestone_community_help; - - @Expose - public Map<String, GardenVisitor> visitors; - - @Expose - public Map<NEUInternalName, Double> organic_matter; - - @Expose - public Map<NEUInternalName, Double> fuel; - - public static class GardenVisitor { - @Expose - public LorenzRarity rarity; - - @Expose - public LorenzRarity new_rarity; - - @Nullable - @Expose - public LorenzVec position; - - /** - * Formatted as follows: - * - If this visitor is a player, get the encoded skin value - * - If this visitor is a mob, get their mob class name - */ - @Nullable - @Expose - public String skinOrType; - - @Nullable - @Expose - public String mode; - - @Expose - public List<String> need_items; - } -} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/GardenJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/GardenJson.kt new file mode 100644 index 000000000..4f922dfa2 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/GardenJson.kt @@ -0,0 +1,26 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo + +import at.hannibal2.skyhanni.features.garden.CropType +import at.hannibal2.skyhanni.utils.LorenzRarity +import at.hannibal2.skyhanni.utils.LorenzVec +import at.hannibal2.skyhanni.utils.NEUInternalName +import com.google.gson.annotations.Expose +import com.google.gson.annotations.SerializedName + +data class GardenJson( + @Expose @SerializedName("garden_exp") val gardenExp: List<Int>, + @Expose @SerializedName("crop_milestones") val cropMilestones: Map<CropType, List<Int>>, + @Expose @SerializedName("crop_milestone_community_help") val cropMilestoneCommunityHelp: Map<String, Boolean>, + @Expose val visitors: Map<String, GardenVisitor>, + @Expose @SerializedName("organic_matter") val organicMatter: Map<NEUInternalName, Double>, + @Expose val fuel: Map<NEUInternalName, Double> +) + +data class GardenVisitor( + @Expose val rarity: LorenzRarity, + @Expose @SerializedName("new_rarity") val newRarity: LorenzRarity?, + @Expose val position: LorenzVec?, + @Expose var skinOrType: String?, + @Expose val mode: String, + @Expose @SerializedName("need_items") val needItems: List<String> +) diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/HideNotClickableItemsJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/HideNotClickableItemsJson.java deleted file mode 100644 index 8877e596e..000000000 --- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/HideNotClickableItemsJson.java +++ /dev/null @@ -1,30 +0,0 @@ -package at.hannibal2.skyhanni.data.jsonobjects.repo; - -import com.google.gson.annotations.Expose; - -import java.util.List; - -public class HideNotClickableItemsJson { - @Expose - public MultiFilterJson hide_npc_sell; - - @Expose - public MultiFilterJson hide_in_storage; - - @Expose - public MultiFilterJson hide_player_trade; - - @Expose - public MultiFilterJson not_auctionable; - - @Expose - public SalvageFilter salvage; - - public static class SalvageFilter { - @Expose - public List<String> armor; - - @Expose - public List<String> items; - } -} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/HideNotClickableItemsJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/HideNotClickableItemsJson.kt new file mode 100644 index 000000000..e8a8ba804 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/HideNotClickableItemsJson.kt @@ -0,0 +1,17 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo + +import com.google.gson.annotations.Expose +import com.google.gson.annotations.SerializedName + +data class HideNotClickableItemsJson( + @Expose @SerializedName("hide_npc_sell") val hideNpcSell: MultiFilterJson, + @Expose @SerializedName("hide_in_storage") val hideInStorage: MultiFilterJson, + @Expose @SerializedName("hide_player_trade") val hidePlayerTrade: MultiFilterJson, + @Expose @SerializedName("not_auctionable") val notAuctionable: MultiFilterJson, + @Expose val salvage: SalvageFilter, +) + +data class SalvageFilter( + @Expose val armor: List<String>, + @Expose val items: List<String> +) diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ItemsJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ItemsJson.java deleted file mode 100644 index 0efeeb9fd..000000000 --- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ItemsJson.java +++ /dev/null @@ -1,27 +0,0 @@ -package at.hannibal2.skyhanni.data.jsonobjects.repo; - -import at.hannibal2.skyhanni.utils.NEUInternalName; -import com.google.gson.annotations.Expose; - -import java.util.List; -import java.util.Map; - -public class ItemsJson { - @Expose - public List<String> crimson_armors; - - @Expose - public Map<String, Integer> crimson_tiers; - - @Expose - public Map<String, Float> enchant_multiplier; - - @Expose - public List<NEUInternalName> lava_fishing_rods; - - @Expose - public List<NEUInternalName> water_fishing_rods; - - @Expose - public Map<String, Integer> book_bundle_amount; -} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ItemsJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ItemsJson.kt new file mode 100644 index 000000000..c70d0afa5 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ItemsJson.kt @@ -0,0 +1,14 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo + +import at.hannibal2.skyhanni.utils.NEUInternalName +import com.google.gson.annotations.Expose +import com.google.gson.annotations.SerializedName + +data class ItemsJson( + @Expose @SerializedName("crimson_armors") val crimsonArmors: List<String>, + @Expose @SerializedName("crimson_tiers") val crimsonTiers: Map<String, Int>, + @Expose @SerializedName("enchant_multiplier") val enchantMultiplier: Map<String, Float>, + @Expose @SerializedName("lava_fishing_rods") val lavaFishingRods: List<NEUInternalName>, + @Expose @SerializedName("water_fishing_rods") val waterFishingRods: List<NEUInternalName>, + @Expose @SerializedName("book_bundle_amount") val bookBundleAmount: Map<String, Int>, +) diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/LocationFixJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/LocationFixJson.java deleted file mode 100644 index 0df76b4a9..000000000 --- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/LocationFixJson.java +++ /dev/null @@ -1,27 +0,0 @@ -package at.hannibal2.skyhanni.data.jsonobjects.repo; - -import at.hannibal2.skyhanni.utils.LorenzVec; -import com.google.gson.annotations.Expose; - -import java.util.Map; - -public class LocationFixJson { - - @Expose - public Map<String, LocationFix> locationFixes; - - public static class LocationFix { - @Expose - public LorenzVec a; - - @Expose - public LorenzVec b; - - @Expose - public String island_name; - - @Expose - public String real_location; - } - -} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/LocationFixJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/LocationFixJson.kt new file mode 100644 index 000000000..bc4e8552c --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/LocationFixJson.kt @@ -0,0 +1,16 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo + +import at.hannibal2.skyhanni.utils.LorenzVec +import com.google.gson.annotations.Expose +import com.google.gson.annotations.SerializedName + +data class LocationFixJson( + @Expose val locationFixes: Map<String, LocationFix> +) + +data class LocationFix( + @Expose val a: LorenzVec, + @Expose val b: LorenzVec, + @Expose @SerializedName("island_name") val islandName: String, + @Expose @SerializedName("real_location") val realLocation: String, +) diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/MaxwellPowersJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/MaxwellPowersJson.java deleted file mode 100644 index 6ac70abb6..000000000 --- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/MaxwellPowersJson.java +++ /dev/null @@ -1,10 +0,0 @@ -package at.hannibal2.skyhanni.data.jsonobjects.repo; - -import com.google.gson.annotations.Expose; - -import java.util.List; - -public class MaxwellPowersJson { - @Expose - public List<String> powers; -} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/MaxwellPowersJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/MaxwellPowersJson.kt new file mode 100644 index 000000000..366324a09 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/MaxwellPowersJson.kt @@ -0,0 +1,7 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo + +import com.google.gson.annotations.Expose + +data class MaxwellPowersJson( + @Expose val powers: MutableList<String> +) diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/MinionXPJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/MinionXPJson.java deleted file mode 100644 index 44f66b8b8..000000000 --- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/MinionXPJson.java +++ /dev/null @@ -1,10 +0,0 @@ -package at.hannibal2.skyhanni.data.jsonobjects.repo; - -import com.google.gson.annotations.Expose; - -import java.util.Map; - -public class MinionXPJson { - @Expose - public Map<String, Map<String, Double>> minion_xp; -} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/MinionXPJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/MinionXPJson.kt new file mode 100644 index 000000000..bab62509d --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/MinionXPJson.kt @@ -0,0 +1,8 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo + +import com.google.gson.annotations.Expose +import com.google.gson.annotations.SerializedName + +data class MinionXPJson( + @Expose @SerializedName("minion_xp") val minionXp: Map<String, Map<String, Double>> +) diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ModGuiSwitcherJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ModGuiSwitcherJson.java deleted file mode 100644 index cf0b0656d..000000000 --- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ModGuiSwitcherJson.java +++ /dev/null @@ -1,25 +0,0 @@ -package at.hannibal2.skyhanni.data.jsonobjects.repo; - -import com.google.gson.annotations.Expose; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -public class ModGuiSwitcherJson { - - @Expose - public Map<String, Mod> mods = new HashMap<>(); - - public static class Mod { - @Expose - public List<String> description = new ArrayList<>(); - - @Expose - public String command = ""; - - @Expose - public List<String> guiPath = new ArrayList<>(); - } -} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ModGuiSwitcherJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ModGuiSwitcherJson.kt new file mode 100644 index 000000000..2789abd1d --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ModGuiSwitcherJson.kt @@ -0,0 +1,13 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo + +import com.google.gson.annotations.Expose + +data class ModGuiSwitcherJson( + @Expose val mods: Map<String, OtherModInfo> +) + +data class OtherModInfo( + @Expose val description: List<String>, + @Expose val command: String, + @Expose val guiPath: List<String> +) diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/MultiFilterJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/MultiFilterJson.java deleted file mode 100644 index 0d0c0d6e1..000000000 --- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/MultiFilterJson.java +++ /dev/null @@ -1,25 +0,0 @@ -package at.hannibal2.skyhanni.data.jsonobjects.repo; - -import com.google.gson.annotations.Expose; - -import java.util.List; - -public class MultiFilterJson { - @Expose - public List<String> equals; - - @Expose - public List<String> startsWith; - - @Expose - public List<String> endsWith; - - @Expose - public List<String> contains; - - @Expose - public List<String> containsWord; - - @Expose - public String description; -} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/MultiFilterJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/MultiFilterJson.kt new file mode 100644 index 000000000..51279c498 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/MultiFilterJson.kt @@ -0,0 +1,12 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo + +import com.google.gson.annotations.Expose + +data class MultiFilterJson( + @Expose val equals: List<String>, + @Expose val startsWith: List<String>, + @Expose val endsWith: List<String>, + @Expose val contains: List<String>, + @Expose val containsWord: List<String>, + @Expose val description: String, +) diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ParkourJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ParkourJson.java deleted file mode 100644 index 0dd511430..000000000 --- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ParkourJson.java +++ /dev/null @@ -1,23 +0,0 @@ -package at.hannibal2.skyhanni.data.jsonobjects.repo; - -import at.hannibal2.skyhanni.utils.LorenzVec; -import com.google.gson.annotations.Expose; - -import java.util.ArrayList; -import java.util.List; - -public class ParkourJson { - @Expose - public List<LorenzVec> locations; - - @Expose - public List<ShortCut> shortCuts = new ArrayList<>(); - - public static class ShortCut { - @Expose - public int from; - - @Expose - public int to; - } -} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ParkourJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ParkourJson.kt new file mode 100644 index 000000000..42f2861b0 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ParkourJson.kt @@ -0,0 +1,14 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo + +import at.hannibal2.skyhanni.utils.LorenzVec +import com.google.gson.annotations.Expose + +data class ParkourJson( + @Expose val locations: List<LorenzVec>, + @Expose val shortCuts: List<ParkourShortCut> = listOf() +) + +data class ParkourShortCut( + @Expose val from: Int, + @Expose val to: Int +) diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/PlayerChatFilterJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/PlayerChatFilterJson.java deleted file mode 100644 index 708ac24e0..000000000 --- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/PlayerChatFilterJson.java +++ /dev/null @@ -1,10 +0,0 @@ -package at.hannibal2.skyhanni.data.jsonobjects.repo; - -import com.google.gson.annotations.Expose; - -import java.util.List; - -public class PlayerChatFilterJson { - @Expose - public List<MultiFilterJson> filters; -} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/PlayerChatFilterJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/PlayerChatFilterJson.kt new file mode 100644 index 000000000..51d9de94d --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/PlayerChatFilterJson.kt @@ -0,0 +1,7 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo + +import com.google.gson.annotations.Expose + +data class PlayerChatFilterJson( + @Expose val filters: List<MultiFilterJson> +) diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/RiftEffigiesJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/RiftEffigiesJson.java deleted file mode 100644 index ad94c374d..000000000 --- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/RiftEffigiesJson.java +++ /dev/null @@ -1,11 +0,0 @@ -package at.hannibal2.skyhanni.data.jsonobjects.repo; - -import at.hannibal2.skyhanni.utils.LorenzVec; -import com.google.gson.annotations.Expose; - -import java.util.List; - -public class RiftEffigiesJson { - @Expose - public List<LorenzVec> locations; -} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/RiftEffigiesJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/RiftEffigiesJson.kt new file mode 100644 index 000000000..4fd2b1853 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/RiftEffigiesJson.kt @@ -0,0 +1,8 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo + +import at.hannibal2.skyhanni.utils.LorenzVec +import com.google.gson.annotations.Expose + +data class RiftEffigiesJson( + @Expose val locations: List<LorenzVec> +) diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/SeaCreatureJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/SeaCreatureJson.java deleted file mode 100644 index 3f8449fb6..000000000 --- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/SeaCreatureJson.java +++ /dev/null @@ -1,33 +0,0 @@ -package at.hannibal2.skyhanni.data.jsonobjects.repo; - -import at.hannibal2.skyhanni.utils.LorenzRarity; -import com.google.gson.annotations.Expose; -import com.google.gson.reflect.TypeToken; - -import java.lang.reflect.Type; -import java.util.Map; - -public class SeaCreatureJson { - - public static Type TYPE = new TypeToken<Map<String, SeaCreatureJson.Variant>>() { - }.getType(); - - public static class Variant { - @Expose - public String chat_color; - @Expose - public Map<String, SeaCreature> sea_creatures; - } - - public static class SeaCreature { - @Expose - public String chat_message; - @Expose - public int fishing_experience; - @Expose - public Boolean rare; - @Expose - public LorenzRarity rarity; - } - -} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/SeaCreatureJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/SeaCreatureJson.kt new file mode 100644 index 000000000..79a64fee1 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/SeaCreatureJson.kt @@ -0,0 +1,24 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo + +import at.hannibal2.skyhanni.utils.LorenzRarity +import com.google.gson.annotations.Expose +import com.google.gson.annotations.SerializedName +import com.google.gson.reflect.TypeToken +import java.lang.reflect.Type + +data class SeaCreatureJson( + @Expose @SerializedName("chat_color") val chatColor: String, + @Expose @SerializedName("sea_creatures") val seaCreatures: Map<String, SeaCreatureInfo> +) { + companion object { + val TYPE: Type = object : TypeToken<Map<String?, SeaCreatureJson>>() { + }.type + } +} + +data class SeaCreatureInfo( + @Expose @SerializedName("chat_message") val chatMessage: String, + @Expose @SerializedName("fishing_experience") val fishingExperience: Int, + @Expose val rare: Boolean = false, + @Expose val rarity: LorenzRarity +) diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/SlayerProfitTrackerItemsJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/SlayerProfitTrackerItemsJson.java deleted file mode 100644 index f9c91bdfc..000000000 --- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/SlayerProfitTrackerItemsJson.java +++ /dev/null @@ -1,12 +0,0 @@ -package at.hannibal2.skyhanni.data.jsonobjects.repo; - -import at.hannibal2.skyhanni.utils.NEUInternalName; -import com.google.gson.annotations.Expose; - -import java.util.List; -import java.util.Map; - -public class SlayerProfitTrackerItemsJson { - @Expose - public Map<String, List<NEUInternalName>> slayers; -} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/SlayerProfitTrackerItemsJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/SlayerProfitTrackerItemsJson.kt new file mode 100644 index 000000000..0449f3fb3 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/SlayerProfitTrackerItemsJson.kt @@ -0,0 +1,8 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo + +import at.hannibal2.skyhanni.utils.NEUInternalName +import com.google.gson.annotations.Expose + +data class SlayerProfitTrackerItemsJson( + @Expose val slayers: Map<String, List<NEUInternalName>> +) diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/TabListJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/TabListJson.java deleted file mode 100644 index 2c475679e..000000000 --- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/TabListJson.java +++ /dev/null @@ -1,11 +0,0 @@ -package at.hannibal2.skyhanni.data.jsonobjects.repo; - -import com.google.gson.annotations.Expose; - -import java.util.List; - -public class TabListJson { - - @Expose - public List<String> sun_moon_symbols; -} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/TrophyFishJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/TrophyFishJson.java deleted file mode 100644 index c15adf1b8..000000000 --- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/TrophyFishJson.java +++ /dev/null @@ -1,25 +0,0 @@ -package at.hannibal2.skyhanni.data.jsonobjects.repo; - -import at.hannibal2.skyhanni.features.fishing.trophy.TrophyRarity; -import com.google.gson.annotations.Expose; - -import java.util.Map; - -public class TrophyFishJson { - @Expose - public Map<String, TrophyFishInfo> trophy_fish; - - public static class TrophyFishInfo { - @Expose - public String displayName; - - @Expose - public String description; - - @Expose - public Integer rate; - - @Expose - public Map<TrophyRarity, Integer> fillet; - } -} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/TrophyFishJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/TrophyFishJson.kt new file mode 100644 index 000000000..48f3a3f67 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/TrophyFishJson.kt @@ -0,0 +1,16 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo + +import at.hannibal2.skyhanni.features.fishing.trophy.TrophyRarity +import com.google.gson.annotations.Expose +import com.google.gson.annotations.SerializedName + +data class TrophyFishJson( + @Expose @SerializedName("trophy_fish") val trophyFish: Map<String, TrophyFishInfo> +) + +data class TrophyFishInfo( + val displayName: String, + val description: String, + val rate: Int?, + val fillet: Map<TrophyRarity, Int> +) diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/VipVisitsJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/VipVisitsJson.java deleted file mode 100644 index d2a4a0562..000000000 --- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/VipVisitsJson.java +++ /dev/null @@ -1,10 +0,0 @@ -package at.hannibal2.skyhanni.data.jsonobjects.repo; - -import com.google.gson.annotations.Expose; - -import java.util.List; - -public class VipVisitsJson { - @Expose - public List<String> vipVisits; -} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/VipVisitsJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/VipVisitsJson.kt new file mode 100644 index 000000000..a6bb541d3 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/VipVisitsJson.kt @@ -0,0 +1,7 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo + +import com.google.gson.annotations.Expose + +data class VipVisitsJson( + @Expose val vipVisits: List<String> +) diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/WarpsJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/WarpsJson.java deleted file mode 100644 index ef81b052a..000000000 --- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/WarpsJson.java +++ /dev/null @@ -1,10 +0,0 @@ -package at.hannibal2.skyhanni.data.jsonobjects.repo; - -import com.google.gson.annotations.Expose; - -import java.util.List; - -public class WarpsJson { - @Expose - public List<String> warpCommands; -} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/WarpsJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/WarpsJson.kt new file mode 100644 index 000000000..6fe3d990b --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/WarpsJson.kt @@ -0,0 +1,7 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo + +import com.google.gson.annotations.Expose + +data class WarpsJson( + @Expose val warpCommands: List<String> +) diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoAPI.kt index e960ec4b6..5950f484d 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoAPI.kt @@ -2,6 +2,7 @@ package at.hannibal2.skyhanni.features.bingo import at.hannibal2.skyhanni.config.storage.PlayerSpecificStorage.BingoSession import at.hannibal2.skyhanni.data.ProfileStorageData +import at.hannibal2.skyhanni.data.jsonobjects.repo.BingoData import at.hannibal2.skyhanni.data.jsonobjects.repo.BingoJson import at.hannibal2.skyhanni.data.jsonobjects.repo.BingoRanksJson import at.hannibal2.skyhanni.events.DebugDataCollectEvent @@ -23,7 +24,7 @@ import java.time.ZoneOffset object BingoAPI { private var ranks = mapOf<String, Int>() - private var data: Map<String, BingoJson.BingoData> = emptyMap() + private var data: Map<String, BingoData> = emptyMap() val bingoGoals get() = bingoStorage.goals val personalGoals get() = bingoGoals.values.filter { it.type == GoalType.PERSONAL } @@ -69,7 +70,7 @@ object BingoAPI { @SubscribeEvent fun onRepoReload(event: RepositoryReloadEvent) { ranks = event.getConstant<BingoRanksJson>("BingoRanks").ranks - data = event.getConstant<BingoJson>("Bingo").bingo_tips + data = event.getConstant<BingoJson>("Bingo").bingoTips } fun getRankFromScoreboard(text: String) = if (detectionPattern.matches(text)) getRank(text) else null @@ -84,7 +85,7 @@ object BingoAPI { fun getData(itemName: String) = data.filter { itemName.startsWith(it.key.split(" (Community Goal)")[0]) }.values.firstOrNull() - fun BingoGoal.getData(): BingoJson.BingoData? = if (type == GoalType.COMMUNITY) { + fun BingoGoal.getData(): BingoData? = if (type == GoalType.COMMUNITY) { getData(displayName) } else { data[displayName] diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardReader.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardReader.kt index 67326faea..6d4a45789 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardReader.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardReader.kt @@ -1,7 +1,7 @@ package at.hannibal2.skyhanni.features.bingo.card import at.hannibal2.skyhanni.SkyHanniMod -import at.hannibal2.skyhanni.data.jsonobjects.repo.BingoJson +import at.hannibal2.skyhanni.data.jsonobjects.repo.BingoData import at.hannibal2.skyhanni.events.InventoryUpdatedEvent import at.hannibal2.skyhanni.events.LorenzChatEvent import at.hannibal2.skyhanni.events.bingo.BingoCardUpdateEvent @@ -166,5 +166,5 @@ object BingoCardReader { BingoCardUpdateEvent().postAndCatch() } - private fun BingoJson.BingoData.getDescriptionLine() = "§7" + note.joinToString(" ") + private fun BingoData.getDescriptionLine() = "§7" + note.joinToString(" ") } diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt index 7dcf9ff7a..9fe716328 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt @@ -1,7 +1,7 @@ package at.hannibal2.skyhanni.features.event.diana import at.hannibal2.skyhanni.SkyHanniMod -import at.hannibal2.skyhanni.data.jsonobjects.repo.DianaDrops +import at.hannibal2.skyhanni.data.jsonobjects.repo.DianaDropsJson import at.hannibal2.skyhanni.events.GuiRenderEvent import at.hannibal2.skyhanni.events.ItemAddEvent import at.hannibal2.skyhanni.events.LorenzChatEvent @@ -54,12 +54,12 @@ object DianaProfitTracker { @Expose var burrowsDug: Long = 0 - override fun getDescription(timesDropped: Long): List<String> { - val percentage = timesDropped.toDouble() / burrowsDug + override fun getDescription(timesGained: Long): List<String> { + val percentage = timesGained.toDouble() / burrowsDug val perBurrow = LorenzUtils.formatPercentage(percentage.coerceAtMost(1.0)) return listOf( - "§7Dropped §e${timesDropped.addSeparators()} §7times.", + "§7Dropped §e${timesGained.addSeparators()} §7times.", "§7Your drop chance per burrow: §c$perBurrow", ) } @@ -148,7 +148,7 @@ object DianaProfitTracker { @SubscribeEvent fun onRepoReload(event: RepositoryReloadEvent) { - allowedDrops = event.getConstant<DianaDrops>("DianaDrops").diana_drops + allowedDrops = event.getConstant<DianaDropsJson>("DianaDrops").dianaDrops } fun resetCommand() { diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/EventWaypoint.kt b/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/EventWaypoint.kt index af2c17be0..411e08e5e 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/EventWaypoint.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/EventWaypoint.kt @@ -1,6 +1,6 @@ package at.hannibal2.skyhanni.features.event.lobby.waypoints -import at.hannibal2.skyhanni.data.jsonobjects.repo.EventWaypointsJson +import at.hannibal2.skyhanni.data.jsonobjects.repo.EventWaypointData import at.hannibal2.skyhanni.utils.LorenzVec data class EventWaypoint( @@ -9,7 +9,7 @@ data class EventWaypoint( var isFound: Boolean = false, ) -fun loadEventWaypoints(waypoints: Map<String, List<EventWaypointsJson.Waypoint>>): Map<String, MutableSet<EventWaypoint>> { +fun loadEventWaypoints(waypoints: Map<String, List<EventWaypointData>>): Map<String, MutableSet<EventWaypoint>> { return buildMap { waypoints.forEach { lobby -> val set = mutableSetOf<EventWaypoint>() diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/christmas/PresentWaypoints.kt b/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/christmas/PresentWaypoints.kt index c76349cd1..b56adecad 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/christmas/PresentWaypoints.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/christmas/PresentWaypoints.kt @@ -120,9 +120,8 @@ object PresentWaypoints { @SubscribeEvent fun onRepoReload(event: RepositoryReloadEvent) { val data = event.getConstant<EventWaypointsJson>("EventWaypoints") - presentLocations = loadEventWaypoints(data.presents ?: error("'presents' is null in EventWaypoints!")) - presentEntranceLocations = - loadEventWaypoints(data.presents_entrances ?: error("'presents_entrances' is null in EventWaypoints!")) + presentLocations = loadEventWaypoints(data.presents) + presentEntranceLocations = loadEventWaypoints(data.presentsEntrances) } private fun isEnabled(): Boolean = diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingAPI.kt index aaf7db8a7..89beae6aa 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingAPI.kt @@ -120,8 +120,8 @@ object FishingAPI { @SubscribeEvent fun onRepoReload(event: RepositoryReloadEvent) { val data = event.getConstant<ItemsJson>("Items") - lavaRods = data.lava_fishing_rods - waterRods = data.water_fishing_rods + lavaRods = data.lavaFishingRods + waterRods = data.waterFishingRods } private fun getAllowedBlocks() = if (holdingLavaRod) lavaBlocks else waterBlocks diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/SeaCreatureManager.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/SeaCreatureManager.kt index 59d9d818b..5f7499574 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fishing/SeaCreatureManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/SeaCreatureManager.kt @@ -35,20 +35,20 @@ class SeaCreatureManager { allFishingMobs = emptyMap() var counter = 0 - val data = event.getConstant<Map<String, SeaCreatureJson.Variant>>("SeaCreatures", SeaCreatureJson.TYPE) + val data = event.getConstant<Map<String, SeaCreatureJson>>("SeaCreatures", SeaCreatureJson.TYPE) val allFishingMobs = mutableMapOf<String, SeaCreature>() val variants = mutableMapOf<String, List<String>>() for ((variantName, variant) in data) { - val chatColor = variant.chat_color + val chatColor = variant.chatColor val variantFishes = mutableListOf<String>() variants[variantName] = variantFishes - for ((name, seaCreature) in variant.sea_creatures) { - val chatMessage = seaCreature.chat_message - val fishingExperience = seaCreature.fishing_experience + for ((name, seaCreature) in variant.seaCreatures) { + val chatMessage = seaCreature.chatMessage + val fishingExperience = seaCreature.fishingExperience val rarity = seaCreature.rarity - val rare = seaCreature.rare ?: false + val rare = seaCreature.rare val creature = SeaCreature(name, fishingExperience, chatColor, rare, rarity) seaCreatureMap[chatMessage] = creature diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishManager.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishManager.kt index 2b3a59032..44893f949 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishManager.kt @@ -2,8 +2,8 @@ package at.hannibal2.skyhanni.features.fishing.trophy import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.data.ProfileStorageData +import at.hannibal2.skyhanni.data.jsonobjects.repo.TrophyFishInfo import at.hannibal2.skyhanni.data.jsonobjects.repo.TrophyFishJson -import at.hannibal2.skyhanni.data.jsonobjects.repo.TrophyFishJson.TrophyFishInfo import at.hannibal2.skyhanni.events.NeuProfileDataLoadedEvent import at.hannibal2.skyhanni.events.RepositoryReloadEvent import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule @@ -21,7 +21,7 @@ object TrophyFishManager { @SubscribeEvent fun onRepoReload(event: RepositoryReloadEvent) { val data = event.getConstant<TrophyFishJson>("TrophyFish") - trophyFishInfo = data.trophy_fish + trophyFishInfo = data.trophyFish } val fish: MutableMap<String, MutableMap<TrophyRarity, Int>>? @@ -87,15 +87,6 @@ object TrophyFishManager { fun getInfoByName(name: String) = trophyFishInfo.values.find { it.displayName == name } fun TrophyFishInfo.getFilletValue(rarity: TrophyRarity): Int { - if (fillet == null) { - ErrorManager.logErrorStateWithData( - "Error trying to read trophy fish info", - "fillet in TrophyFishInfo is null", - "displayName" to displayName, - "TrophyFishInfo" to this, - ) - return -1 - } return fillet.getOrDefault(rarity, -1) } diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt index 86bbafab7..46d694131 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt @@ -275,7 +275,7 @@ object GardenAPI { @SubscribeEvent fun onRepoReload(event: RepositoryReloadEvent) { val data = event.getConstant<GardenJson>("Garden") - gardenExperience = data.garden_exp + gardenExperience = data.gardenExp totalAmountVisitorsExisting = data.visitors.size } diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt index 701082d63..b198b3e3a 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt @@ -550,7 +550,7 @@ object ComposterOverlay { @SubscribeEvent fun onRepoReload(event: RepositoryReloadEvent) { val data = event.getConstant<GardenJson>("Garden") - organicMatter = data.organic_matter + organicMatter = data.organicMatter fuelFactors = data.fuel updateOrganicMatterFactors() } diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/ArmorDropTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/ArmorDropTracker.kt index 294aa0424..b55ed769d 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/ArmorDropTracker.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/ArmorDropTracker.kt @@ -2,8 +2,8 @@ package at.hannibal2.skyhanni.features.garden.farming import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator import at.hannibal2.skyhanni.data.IslandType +import at.hannibal2.skyhanni.data.jsonobjects.repo.ArmorDropInfo import at.hannibal2.skyhanni.data.jsonobjects.repo.ArmorDropsJson -import at.hannibal2.skyhanni.data.jsonobjects.repo.ArmorDropsJson.DropInfo import at.hannibal2.skyhanni.events.GuiRenderEvent import at.hannibal2.skyhanni.events.IslandChangeEvent import at.hannibal2.skyhanni.events.LorenzChatEvent @@ -126,10 +126,10 @@ object ArmorDropTracker { @SubscribeEvent fun onRepoReload(event: RepositoryReloadEvent) { val data = event.getConstant<ArmorDropsJson>("ArmorDrops") - armorDropInfo = data.special_crops + armorDropInfo = data.specialCrops } - private var armorDropInfo = mapOf<String, DropInfo>() + private var armorDropInfo = mapOf<String, ArmorDropInfo>() private var currentArmorDropChance = 0.0 private var lastCalculationTime = SimpleTimeMark.farPast() @@ -140,7 +140,7 @@ object ArmorDropTracker { lastCalculationTime = SimpleTimeMark.now() val armorDropName = crop.specialDropType - val armorName = armorDropInfo[armorDropName]?.armor_type ?: return 0.0 + val armorName = armorDropInfo[armorDropName]?.armorType ?: return 0.0 val pieceCount = InventoryUtils.getArmor() .mapNotNull { it?.getInternalName()?.asString() } .count { it.contains(armorName) || it.contains("FERMENTO") } diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropSpeed.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropSpeed.kt index c81c30db5..f4d954229 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropSpeed.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropSpeed.kt @@ -6,7 +6,7 @@ import at.hannibal2.skyhanni.data.GardenCropMilestones.getCounter import at.hannibal2.skyhanni.data.GardenCropMilestones.setCounter import at.hannibal2.skyhanni.data.Perk import at.hannibal2.skyhanni.data.jsonobjects.repo.DicerDropsJson -import at.hannibal2.skyhanni.data.jsonobjects.repo.DicerDropsJson.DicerType +import at.hannibal2.skyhanni.data.jsonobjects.repo.DicerType import at.hannibal2.skyhanni.events.CropClickEvent import at.hannibal2.skyhanni.events.GardenToolChangeEvent import at.hannibal2.skyhanni.events.ProfileJoinEvent diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/AnitaExtraFarmingFortune.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/AnitaExtraFarmingFortune.kt index 8a619e37e..42b8b5d35 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/AnitaExtraFarmingFortune.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/AnitaExtraFarmingFortune.kt @@ -2,7 +2,7 @@ package at.hannibal2.skyhanni.features.garden.inventory import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator import at.hannibal2.skyhanni.data.jsonobjects.repo.AnitaUpgradeCostsJson -import at.hannibal2.skyhanni.data.jsonobjects.repo.AnitaUpgradeCostsJson.Price +import at.hannibal2.skyhanni.data.jsonobjects.repo.AnitaUpgradePrice import at.hannibal2.skyhanni.events.LorenzToolTipEvent import at.hannibal2.skyhanni.events.RepositoryReloadEvent import at.hannibal2.skyhanni.features.garden.GardenAPI @@ -28,7 +28,7 @@ object AnitaExtraFarmingFortune { "§5§o§aJacob's Ticket §8x(?<realAmount>.*)" ) - private var levelPrice = mapOf<Int, Price>() + private var levelPrice = mapOf<Int, AnitaUpgradePrice>() @SubscribeEvent fun onTooltip(event: LorenzToolTipEvent) { @@ -41,7 +41,7 @@ object AnitaExtraFarmingFortune { val anitaUpgrade = GardenAPI.storage?.fortune?.anitaUpgrade ?: return var contributionFactor = 1.0 - val baseAmount = levelPrice[anitaUpgrade + 1]?.jacob_tickets ?: return + val baseAmount = levelPrice[anitaUpgrade + 1]?.jacobTickets ?: return for (line in event.toolTip) { realAmountPattern.matchMatcher(line) { val realAmount = group("realAmount").formatDouble() @@ -53,8 +53,8 @@ object AnitaExtraFarmingFortune { var jacobTickets = 0 for ((level, price) in levelPrice) { if (level > anitaUpgrade) { - goldMedals += price.gold_medals - jacobTickets += price.jacob_tickets + goldMedals += price.goldMedals + jacobTickets += price.jacobTickets } } jacobTickets = (contributionFactor * jacobTickets).toInt() @@ -80,7 +80,7 @@ object AnitaExtraFarmingFortune { @SubscribeEvent fun onRepoReload(event: RepositoryReloadEvent) { val data = event.getConstant<AnitaUpgradeCostsJson>("AnitaUpgradeCosts") - levelPrice = data.level_price + levelPrice = data.levelPrice } @SubscribeEvent diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorColorNames.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorColorNames.kt index fffff6a6f..5fa0debe5 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorColorNames.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorColorNames.kt @@ -18,9 +18,9 @@ object GardenVisitorColorNames { visitorColours.clear() visitorItems.clear() for ((visitor, visitorData) in data.visitors) { - val rarity = visitorData.new_rarity ?: visitorData.rarity + val rarity = visitorData.newRarity ?: visitorData.rarity visitorColours[visitor] = rarity.color.getChatColor() - visitorItems[visitor] = visitorData.need_items + visitorItems[visitor] = visitorData.needItems } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/HighlightVisitorsOutsideOfGarden.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/HighlightVisitorsOutsideOfGarden.kt index 848bcc992..729f9d847 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/HighlightVisitorsOutsideOfGarden.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/HighlightVisitorsOutsideOfGarden.kt @@ -2,6 +2,7 @@ package at.hannibal2.skyhanni.features.garden.visitor import at.hannibal2.skyhanni.config.features.garden.visitor.VisitorConfig.VisitorBlockBehaviour import at.hannibal2.skyhanni.data.jsonobjects.repo.GardenJson +import at.hannibal2.skyhanni.data.jsonobjects.repo.GardenVisitor import at.hannibal2.skyhanni.events.PacketEvent import at.hannibal2.skyhanni.events.RepositoryReloadEvent import at.hannibal2.skyhanni.events.SecondPassedEvent @@ -29,7 +30,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent @SkyHanniModule object HighlightVisitorsOutsideOfGarden { - private var visitorJson = mapOf<String?, List<GardenJson.GardenVisitor>>() + private var visitorJson = mapOf<String?, List<GardenVisitor>>() private val config get() = GardenAPI.config.visitors @@ -59,7 +60,7 @@ object HighlightVisitorsOutsideOfGarden { val possibleJsons = visitorJson[mode] ?: return false val skinOrType = getSkinOrTypeFor(entity) return possibleJsons.any { - (it.position == null || it.position!!.distance(entity.position.toLorenzVec()) < 1) + (it.position == null || it.position.distance(entity.position.toLorenzVec()) < 1) && it.skinOrType == skinOrType } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt index b8f511cdc..f7944fcde 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt @@ -3,7 +3,7 @@ package at.hannibal2.skyhanni.features.inventory import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator import at.hannibal2.skyhanni.data.jsonobjects.repo.HideNotClickableItemsJson -import at.hannibal2.skyhanni.data.jsonobjects.repo.HideNotClickableItemsJson.SalvageFilter +import at.hannibal2.skyhanni.data.jsonobjects.repo.SalvageFilter import at.hannibal2.skyhanni.events.GuiContainerEvent import at.hannibal2.skyhanni.events.LorenzToolTipEvent import at.hannibal2.skyhanni.events.RepositoryReloadEvent @@ -76,10 +76,10 @@ object HideNotClickableItems { @SubscribeEvent fun onRepoReload(event: RepositoryReloadEvent) { val hideNotClickable = event.getConstant<HideNotClickableItemsJson>("HideNotClickableItems") - hideNpcSellFilter.load(hideNotClickable.hide_npc_sell) - hideInStorageFilter.load(hideNotClickable.hide_in_storage) - hidePlayerTradeFilter.load(hideNotClickable.hide_player_trade) - notAuctionableFilter.load(hideNotClickable.not_auctionable) + hideNpcSellFilter.load(hideNotClickable.hideNpcSell) + hideInStorageFilter.load(hideNotClickable.hideInStorage) + hidePlayerTradeFilter.load(hideNotClickable.hidePlayerTrade) + notAuctionableFilter.load(hideNotClickable.notAuctionable) updateSalvageList(hideNotClickable.salvage) } diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemStars.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemStars.kt index 34e39bc28..8e2a5c592 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemStars.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemStars.kt @@ -53,8 +53,8 @@ object ItemStars { val data = event.getConstant<ItemsJson>("Items") armorNames.clear() tiers.clear() - armorNames.addAll(data.crimson_armors) - for (tier in data.crimson_tiers) { + armorNames.addAll(data.crimsonArmors) + for (tier in data.crimsonTiers) { tiers[tier.key] = tier.value } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/minion/MinionXp.kt b/src/main/java/at/hannibal2/skyhanni/features/minion/MinionXp.kt index 31291345a..9cf785503 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/minion/MinionXp.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/minion/MinionXp.kt @@ -184,7 +184,7 @@ object MinionXp { @SubscribeEvent fun onRepoReload(event: RepositoryReloadEvent) { - xpInfoMap = event.getConstant<MinionXPJson>("MinionXP").minion_xp.mapNotNull { xpType -> + xpInfoMap = event.getConstant<MinionXPJson>("MinionXP").minionXp.mapNotNull { xpType -> xpType.value.mapNotNull { it.key.asInternalName() to XpInfo(SkillType.getByName(xpType.key), it.value) } }.flatten().toMap() } diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/InGameDateDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/InGameDateDisplay.kt index 85d06060d..e0045ba76 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/InGameDateDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/InGameDateDisplay.kt @@ -2,9 +2,7 @@ package at.hannibal2.skyhanni.features.misc import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.data.ScoreboardData -import at.hannibal2.skyhanni.data.jsonobjects.repo.TabListJson import at.hannibal2.skyhanni.events.GuiRenderEvent -import at.hannibal2.skyhanni.events.RepositoryReloadEvent import at.hannibal2.skyhanni.events.SecondPassedEvent import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.utils.LorenzUtils @@ -21,19 +19,17 @@ object InGameDateDisplay { private val config get() = SkyHanniMod.feature.gui.inGameDate - private val monthAndDatePattern by RepoPattern.pattern( - "misc.ingametime.date", + private val patternGroup = RepoPattern.group("misc.ingametime") + private val monthAndDatePattern by patternGroup.pattern( + "date", ".*((Early|Late) )?(Winter|Spring|Summer|Autumn) [0-9]{1,2}(nd|rd|th|st)?.*" ) - private var display = "" - - // sun, moon, spooky - private var sunMoonIcons = emptyList<String>() + private val timeSymbolsPattern by patternGroup.pattern( + "symbols", + "([☀☽࿇])" + ) - @SubscribeEvent - fun onRepoReload(event: RepositoryReloadEvent) { - sunMoonIcons = event.getConstant<TabListJson>("TabList").sun_moon_symbols - } + private var display = "" @SubscribeEvent fun onSecondPassed(event: SecondPassedEvent) { @@ -57,7 +53,7 @@ object InGameDateDisplay { val time = list.find { it.lowercase().contains("am ") || it.lowercase().contains("pm ") } ?: "??" theBaseString = "$monthAndDate, $year ${time.trim()}".removeColor() if (!config.includeSunMoon) { - sunMoonIcons.forEach { theBaseString = theBaseString.replace(it, "") } + theBaseString = timeSymbolsPattern.matcher(theBaseString).replaceAll("") } } else { theBaseString = date.formatted() diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt index 8fb37ee6e..d0e198765 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt @@ -61,7 +61,7 @@ object EstimatedItemValue { @SubscribeEvent fun onRepoReload(event: RepositoryReloadEvent) { val data = event.getConstant<ItemsJson>("Items") - bookBundleAmount = data.book_bundle_amount ?: error("book_bundle_amount is missing") + bookBundleAmount = data.bookBundleAmount } @SubscribeEvent diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/QuestLoader.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/QuestLoader.kt index 0cd1a1888..694ebed35 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/QuestLoader.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/QuestLoader.kt @@ -1,7 +1,7 @@ package at.hannibal2.skyhanni.features.nether.reputationhelper.dailyquest import at.hannibal2.skyhanni.config.storage.ProfileSpecificStorage -import at.hannibal2.skyhanni.data.jsonobjects.repo.CrimsonIsleReputationJson.ReputationQuest +import at.hannibal2.skyhanni.data.jsonobjects.repo.ReputationQuest import at.hannibal2.skyhanni.data.model.TabWidget import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent import at.hannibal2.skyhanni.features.nether.reputationhelper.dailyquest.quest.DojoQuest diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/kuudra/DailyKuudraBossHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/kuudra/DailyKuudraBossHelper.kt index c1edbfb4f..1797e2227 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/kuudra/DailyKuudraBossHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/kuudra/DailyKuudraBossHelper.kt @@ -3,7 +3,7 @@ package at.hannibal2.skyhanni.features.nether.reputationhelper.kuudra import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.config.storage.ProfileSpecificStorage import at.hannibal2.skyhanni.data.IslandType -import at.hannibal2.skyhanni.data.jsonobjects.repo.CrimsonIsleReputationJson.ReputationQuest +import at.hannibal2.skyhanni.data.jsonobjects.repo.ReputationQuest import at.hannibal2.skyhanni.events.KuudraCompleteEvent import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent import at.hannibal2.skyhanni.features.nether.kuudra.KuudraTier diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/miniboss/DailyMiniBossHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/miniboss/DailyMiniBossHelper.kt index 291b5901b..64b2bcf45 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/miniboss/DailyMiniBossHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/miniboss/DailyMiniBossHelper.kt @@ -3,7 +3,7 @@ package at.hannibal2.skyhanni.features.nether.reputationhelper.miniboss import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.config.storage.ProfileSpecificStorage import at.hannibal2.skyhanni.data.IslandType -import at.hannibal2.skyhanni.data.jsonobjects.repo.CrimsonIsleReputationJson.ReputationQuest +import at.hannibal2.skyhanni.data.jsonobjects.repo.ReputationQuest import at.hannibal2.skyhanni.events.LorenzChatEvent import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent import at.hannibal2.skyhanni.features.combat.damageindicator.DamageIndicatorManager diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/EnigmaSoulWaypoints.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/EnigmaSoulWaypoints.kt index c4c275cfa..56efab49b 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/EnigmaSoulWaypoints.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/EnigmaSoulWaypoints.kt @@ -147,9 +147,9 @@ object EnigmaSoulWaypoints { @SubscribeEvent fun onRepoReload(event: RepositoryReloadEvent) { val data = event.getConstant<EnigmaSoulsJson>("EnigmaSouls") - val areas = data.areas ?: error("'areas' is null in EnigmaSouls!") + val areas = data.areas soulLocations = buildMap { - for ((area, locations) in areas) { + for ((_, locations) in areas) { for (location in locations) { this[location.name] = location.position } diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ParkourHelper.kt b/src/main/java/at/hannibal2/skyhanni/utils/ParkourHelper.kt index 658118bcb..cf01b2bf9 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/ParkourHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/ParkourHelper.kt @@ -1,7 +1,7 @@ package at.hannibal2.skyhanni.utils import at.hannibal2.skyhanni.SkyHanniMod -import at.hannibal2.skyhanni.data.jsonobjects.repo.ParkourJson.ShortCut +import at.hannibal2.skyhanni.data.jsonobjects.repo.ParkourShortCut import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent import at.hannibal2.skyhanni.test.command.ErrorManager import at.hannibal2.skyhanni.utils.CollectionUtils.toSingletonListOrEmpty @@ -18,7 +18,7 @@ import kotlin.time.Duration.Companion.seconds class ParkourHelper( val locations: List<LorenzVec>, - private val shortCuts: List<ShortCut>, + private val shortCuts: List<ParkourShortCut>, val platformSize: Double = 1.0, val detectionRange: Double = 1.0, val depth: Boolean = true, |