From 79d0cd3af5b2acf11fc63bc3aa6743f784a3a0f6 Mon Sep 17 00:00:00 2001 From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com> Date: Fri, 7 Jun 2024 22:10:11 +1000 Subject: Backend: Change Java to Kotlin for repo files (#1543) --- .../java/at/hannibal2/skyhanni/data/FameRanks.kt | 2 +- .../skyhanni/data/GardenCropMilestones.kt | 2 +- .../data/GardenCropMilestonesCommunityFix.kt | 2 +- .../at/hannibal2/skyhanni/data/LocationFixData.kt | 4 +- .../jsonobjects/repo/AnitaUpgradeCostsJson.java | 18 ------- .../data/jsonobjects/repo/AnitaUpgradeCostsJson.kt | 13 +++++ .../data/jsonobjects/repo/ArmorDropsJson.java | 19 ------- .../data/jsonobjects/repo/ArmorDropsJson.kt | 13 +++++ .../data/jsonobjects/repo/ArrowTypeJson.java | 15 ------ .../data/jsonobjects/repo/ArrowTypeJson.kt | 11 ++++ .../skyhanni/data/jsonobjects/repo/BeltsJson.java | 10 ---- .../skyhanni/data/jsonobjects/repo/BeltsJson.kt | 7 +++ .../skyhanni/data/jsonobjects/repo/BingoJson.java | 25 --------- .../skyhanni/data/jsonobjects/repo/BingoJson.kt | 15 ++++++ .../data/jsonobjects/repo/BingoRanksJson.java | 10 ---- .../data/jsonobjects/repo/BingoRanksJson.kt | 7 +++ .../repo/CrimsonIsleReputationJson.java | 35 ------------- .../jsonobjects/repo/CrimsonIsleReputationJson.kt | 18 +++++++ .../repo/DanceRoomInstructionsJson.java | 10 ---- .../jsonobjects/repo/DanceRoomInstructionsJson.kt | 7 +++ .../skyhanni/data/jsonobjects/repo/DianaDrops.java | 11 ---- .../data/jsonobjects/repo/DianaDropsJson.kt | 9 ++++ .../data/jsonobjects/repo/DicerDropsJson.java | 31 ------------ .../data/jsonobjects/repo/DicerDropsJson.kt | 19 +++++++ .../jsonobjects/repo/DisabledFeaturesJson.java | 10 ---- .../data/jsonobjects/repo/DisabledFeaturesJson.kt | 7 +++ .../data/jsonobjects/repo/EnigmaSoulsJson.java | 20 -------- .../data/jsonobjects/repo/EnigmaSoulsJson.kt | 13 +++++ .../data/jsonobjects/repo/EventWaypointsJson.java | 25 --------- .../data/jsonobjects/repo/EventWaypointsJson.kt | 15 ++++++ .../data/jsonobjects/repo/FameRankJson.java | 24 --------- .../skyhanni/data/jsonobjects/repo/FameRankJson.kt | 15 ++++++ .../jsonobjects/repo/FishingProfitItemsJson.java | 12 ----- .../jsonobjects/repo/FishingProfitItemsJson.kt | 8 +++ .../skyhanni/data/jsonobjects/repo/GardenJson.java | 59 ---------------------- .../skyhanni/data/jsonobjects/repo/GardenJson.kt | 26 ++++++++++ .../repo/HideNotClickableItemsJson.java | 30 ----------- .../jsonobjects/repo/HideNotClickableItemsJson.kt | 17 +++++++ .../skyhanni/data/jsonobjects/repo/ItemsJson.java | 27 ---------- .../skyhanni/data/jsonobjects/repo/ItemsJson.kt | 14 +++++ .../data/jsonobjects/repo/LocationFixJson.java | 27 ---------- .../data/jsonobjects/repo/LocationFixJson.kt | 16 ++++++ .../data/jsonobjects/repo/MaxwellPowersJson.java | 10 ---- .../data/jsonobjects/repo/MaxwellPowersJson.kt | 7 +++ .../data/jsonobjects/repo/MinionXPJson.java | 10 ---- .../skyhanni/data/jsonobjects/repo/MinionXPJson.kt | 8 +++ .../data/jsonobjects/repo/ModGuiSwitcherJson.java | 25 --------- .../data/jsonobjects/repo/ModGuiSwitcherJson.kt | 13 +++++ .../data/jsonobjects/repo/MultiFilterJson.java | 25 --------- .../data/jsonobjects/repo/MultiFilterJson.kt | 12 +++++ .../data/jsonobjects/repo/ParkourJson.java | 23 --------- .../skyhanni/data/jsonobjects/repo/ParkourJson.kt | 14 +++++ .../jsonobjects/repo/PlayerChatFilterJson.java | 10 ---- .../data/jsonobjects/repo/PlayerChatFilterJson.kt | 7 +++ .../data/jsonobjects/repo/RiftEffigiesJson.java | 11 ---- .../data/jsonobjects/repo/RiftEffigiesJson.kt | 8 +++ .../data/jsonobjects/repo/SeaCreatureJson.java | 33 ------------ .../data/jsonobjects/repo/SeaCreatureJson.kt | 24 +++++++++ .../repo/SlayerProfitTrackerItemsJson.java | 12 ----- .../repo/SlayerProfitTrackerItemsJson.kt | 8 +++ .../data/jsonobjects/repo/TabListJson.java | 11 ---- .../data/jsonobjects/repo/TrophyFishJson.java | 25 --------- .../data/jsonobjects/repo/TrophyFishJson.kt | 16 ++++++ .../data/jsonobjects/repo/VipVisitsJson.java | 10 ---- .../data/jsonobjects/repo/VipVisitsJson.kt | 7 +++ .../skyhanni/data/jsonobjects/repo/WarpsJson.java | 10 ---- .../skyhanni/data/jsonobjects/repo/WarpsJson.kt | 7 +++ .../hannibal2/skyhanni/features/bingo/BingoAPI.kt | 7 +-- .../features/bingo/card/BingoCardReader.kt | 4 +- .../features/event/diana/DianaProfitTracker.kt | 10 ++-- .../event/lobby/waypoints/EventWaypoint.kt | 4 +- .../lobby/waypoints/christmas/PresentWaypoints.kt | 5 +- .../skyhanni/features/fishing/FishingAPI.kt | 4 +- .../features/fishing/SeaCreatureManager.kt | 12 ++--- .../features/fishing/trophy/TrophyFishManager.kt | 13 +---- .../skyhanni/features/garden/GardenAPI.kt | 2 +- .../features/garden/composter/ComposterOverlay.kt | 2 +- .../features/garden/farming/ArmorDropTracker.kt | 8 +-- .../features/garden/farming/GardenCropSpeed.kt | 2 +- .../garden/inventory/AnitaExtraFarmingFortune.kt | 12 ++--- .../garden/visitor/GardenVisitorColorNames.kt | 4 +- .../visitor/HighlightVisitorsOutsideOfGarden.kt | 5 +- .../features/inventory/HideNotClickableItems.kt | 10 ++-- .../skyhanni/features/inventory/ItemStars.kt | 4 +- .../hannibal2/skyhanni/features/minion/MinionXp.kt | 2 +- .../skyhanni/features/misc/InGameDateDisplay.kt | 22 ++++---- .../features/misc/items/EstimatedItemValue.kt | 2 +- .../reputationhelper/dailyquest/QuestLoader.kt | 2 +- .../kuudra/DailyKuudraBossHelper.kt | 2 +- .../miniboss/DailyMiniBossHelper.kt | 2 +- .../rift/everywhere/EnigmaSoulWaypoints.kt | 4 +- .../at/hannibal2/skyhanni/utils/ParkourHelper.kt | 4 +- 92 files changed, 454 insertions(+), 718 deletions(-) delete mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/AnitaUpgradeCostsJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/AnitaUpgradeCostsJson.kt delete mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ArmorDropsJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ArmorDropsJson.kt delete mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ArrowTypeJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ArrowTypeJson.kt delete mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/BeltsJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/BeltsJson.kt delete mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/BingoJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/BingoJson.kt delete mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/BingoRanksJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/BingoRanksJson.kt delete mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/CrimsonIsleReputationJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/CrimsonIsleReputationJson.kt delete mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DanceRoomInstructionsJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DanceRoomInstructionsJson.kt delete mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DianaDrops.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DianaDropsJson.kt delete mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DicerDropsJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DicerDropsJson.kt delete mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DisabledFeaturesJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DisabledFeaturesJson.kt delete mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/EnigmaSoulsJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/EnigmaSoulsJson.kt delete mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/EventWaypointsJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/EventWaypointsJson.kt delete mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/FameRankJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/FameRankJson.kt delete mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/FishingProfitItemsJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/FishingProfitItemsJson.kt delete mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/GardenJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/GardenJson.kt delete mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/HideNotClickableItemsJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/HideNotClickableItemsJson.kt delete mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ItemsJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ItemsJson.kt delete mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/LocationFixJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/LocationFixJson.kt delete mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/MaxwellPowersJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/MaxwellPowersJson.kt delete mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/MinionXPJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/MinionXPJson.kt delete mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ModGuiSwitcherJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ModGuiSwitcherJson.kt delete mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/MultiFilterJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/MultiFilterJson.kt delete mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ParkourJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ParkourJson.kt delete mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/PlayerChatFilterJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/PlayerChatFilterJson.kt delete mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/RiftEffigiesJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/RiftEffigiesJson.kt delete mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/SeaCreatureJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/SeaCreatureJson.kt delete mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/SlayerProfitTrackerItemsJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/SlayerProfitTrackerItemsJson.kt delete mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/TabListJson.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/TrophyFishJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/TrophyFishJson.kt delete mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/VipVisitsJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/VipVisitsJson.kt delete mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/WarpsJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/WarpsJson.kt (limited to 'src/main/java') 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("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("Garden").crop_milestones + cropMilestoneData = event.getConstant("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("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 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 +) + +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 special_crops; - - public static class DropInfo { - @Expose - public String armor_type; - - @Expose - public List 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 +) + +data class ArmorDropInfo( + @Expose @SerializedName("armor_type") val armorType: String, + @Expose val chance: List +) 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 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 +) + +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 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 +) 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 bingo_tips; - - public static class BingoData { - @Expose - public String difficulty; - - @Expose - public List note; - - @Expose - public List 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 +) + +data class BingoData( + @Expose val difficulty: String, + @Expose val note: List, + @Expose val guide: List, + @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 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 +) 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 FISHING; - - @Expose - public Map RESCUE; - - @Expose - public Map FETCH; - - @Expose - public Map DOJO; - - @Expose - public Map MINIBOSS; - - @Expose - public Map KUUDRA; - - public static class ReputationQuest { - @Expose - public NEUInternalName item; - - @Expose - public List 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, + @Expose val RESCUE: Map, + @Expose val FETCH: Map, + @Expose val DOJO: Map, + @Expose val MINIBOSS: Map, + @Expose val KUUDRA: Map, +) + +data class ReputationQuest( + @Expose val item: NEUInternalName, + @Expose val location: List +) 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 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 +) 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 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 +) 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 drops; - } - - public static class DropInfo { - @Expose - public Integer chance; - - @Expose - public List 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 +) + +data class DropInfo( + @Expose val chance: Int, + @Expose val amount: List +) 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 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 +) 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> 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> +) + +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> presents; - - @Expose - public Map> 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>, + @Expose @SerializedName("presents_entrances") val presentsEntrances: Map> +) + +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 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 +) + +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> 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> +) 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 garden_exp; - - @Expose - public Map> crop_milestones; - - @Expose - public Map crop_milestone_community_help; - - @Expose - public Map visitors; - - @Expose - public Map organic_matter; - - @Expose - public Map 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 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, + @Expose @SerializedName("crop_milestones") val cropMilestones: Map>, + @Expose @SerializedName("crop_milestone_community_help") val cropMilestoneCommunityHelp: Map, + @Expose val visitors: Map, + @Expose @SerializedName("organic_matter") val organicMatter: Map, + @Expose val fuel: Map +) + +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 +) 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 armor; - - @Expose - public List 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, + @Expose val items: List +) 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 crimson_armors; - - @Expose - public Map crimson_tiers; - - @Expose - public Map enchant_multiplier; - - @Expose - public List lava_fishing_rods; - - @Expose - public List water_fishing_rods; - - @Expose - public Map 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, + @Expose @SerializedName("crimson_tiers") val crimsonTiers: Map, + @Expose @SerializedName("enchant_multiplier") val enchantMultiplier: Map, + @Expose @SerializedName("lava_fishing_rods") val lavaFishingRods: List, + @Expose @SerializedName("water_fishing_rods") val waterFishingRods: List, + @Expose @SerializedName("book_bundle_amount") val bookBundleAmount: Map, +) 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 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 +) + +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 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 +) 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> 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> +) 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 mods = new HashMap<>(); - - public static class Mod { - @Expose - public List description = new ArrayList<>(); - - @Expose - public String command = ""; - - @Expose - public List 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 +) + +data class OtherModInfo( + @Expose val description: List, + @Expose val command: String, + @Expose val guiPath: List +) 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 equals; - - @Expose - public List startsWith; - - @Expose - public List endsWith; - - @Expose - public List contains; - - @Expose - public List 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, + @Expose val startsWith: List, + @Expose val endsWith: List, + @Expose val contains: List, + @Expose val containsWord: List, + @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 locations; - - @Expose - public List 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, + @Expose val shortCuts: List = 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 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 +) 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 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 +) 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>() { - }.getType(); - - public static class Variant { - @Expose - public String chat_color; - @Expose - public Map 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 +) { + companion object { + val TYPE: Type = object : TypeToken>() { + }.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> 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> +) 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 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 trophy_fish; - - public static class TrophyFishInfo { - @Expose - public String displayName; - - @Expose - public String description; - - @Expose - public Integer rate; - - @Expose - public Map 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 +) + +data class TrophyFishInfo( + val displayName: String, + val description: String, + val rate: Int?, + val fillet: Map +) 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 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 +) 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 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 +) 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() - private var data: Map = emptyMap() + private var data: Map = 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("BingoRanks").ranks - data = event.getConstant("Bingo").bingo_tips + data = event.getConstant("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/feature