summaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorCalMWolfs <94038482+CalMWolfs@users.noreply.github.com>2024-06-07 22:10:11 +1000
committerGitHub <noreply@github.com>2024-06-07 14:10:11 +0200
commit79d0cd3af5b2acf11fc63bc3aa6743f784a3a0f6 (patch)
tree9a8507e4d7fe308dd4a228149f5a864301cfcce9 /src/main/java
parentcfb12e7e3bbaf820f9402c286cba6bb0a33671fa (diff)
downloadskyhanni-79d0cd3af5b2acf11fc63bc3aa6743f784a3a0f6.tar.gz
skyhanni-79d0cd3af5b2acf11fc63bc3aa6743f784a3a0f6.tar.bz2
skyhanni-79d0cd3af5b2acf11fc63bc3aa6743f784a3a0f6.zip
Backend: Change Java to Kotlin for repo files (#1543)
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/FameRanks.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestones.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestonesCommunityFix.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/LocationFixData.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/AnitaUpgradeCostsJson.java18
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/AnitaUpgradeCostsJson.kt13
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ArmorDropsJson.java19
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ArmorDropsJson.kt13
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ArrowTypeJson.java15
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ArrowTypeJson.kt11
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/BeltsJson.java10
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/BeltsJson.kt7
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/BingoJson.java25
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/BingoJson.kt15
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/BingoRanksJson.java10
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/BingoRanksJson.kt7
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/CrimsonIsleReputationJson.java35
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/CrimsonIsleReputationJson.kt18
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DanceRoomInstructionsJson.java10
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DanceRoomInstructionsJson.kt7
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DianaDrops.java11
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DianaDropsJson.kt9
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DicerDropsJson.java31
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DicerDropsJson.kt19
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DisabledFeaturesJson.java10
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DisabledFeaturesJson.kt7
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/EnigmaSoulsJson.java20
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/EnigmaSoulsJson.kt13
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/EventWaypointsJson.java25
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/EventWaypointsJson.kt15
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/FameRankJson.java24
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/FameRankJson.kt15
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/FishingProfitItemsJson.java12
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/FishingProfitItemsJson.kt8
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/GardenJson.java59
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/GardenJson.kt26
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/HideNotClickableItemsJson.java30
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/HideNotClickableItemsJson.kt17
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ItemsJson.java27
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ItemsJson.kt14
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/LocationFixJson.java27
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/LocationFixJson.kt16
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/MaxwellPowersJson.java10
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/MaxwellPowersJson.kt7
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/MinionXPJson.java10
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/MinionXPJson.kt8
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ModGuiSwitcherJson.java25
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ModGuiSwitcherJson.kt13
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/MultiFilterJson.java25
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/MultiFilterJson.kt12
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ParkourJson.java23
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ParkourJson.kt14
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/PlayerChatFilterJson.java10
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/PlayerChatFilterJson.kt7
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/RiftEffigiesJson.java11
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/RiftEffigiesJson.kt8
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/SeaCreatureJson.java33
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/SeaCreatureJson.kt24
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/SlayerProfitTrackerItemsJson.java12
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/SlayerProfitTrackerItemsJson.kt8
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/TabListJson.java11
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/TrophyFishJson.java25
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/TrophyFishJson.kt16
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/VipVisitsJson.java10
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/VipVisitsJson.kt7
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/WarpsJson.java10
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/WarpsJson.kt7
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/bingo/BingoAPI.kt7
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardReader.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaProfitTracker.kt10
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/EventWaypoint.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/christmas/PresentWaypoints.kt5
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/fishing/FishingAPI.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/fishing/SeaCreatureManager.kt12
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishManager.kt13
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/farming/ArmorDropTracker.kt8
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropSpeed.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/inventory/AnitaExtraFarmingFortune.kt12
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorColorNames.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/visitor/HighlightVisitorsOutsideOfGarden.kt5
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt10
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/inventory/ItemStars.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/minion/MinionXp.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/InGameDateDisplay.kt22
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/QuestLoader.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/kuudra/DailyKuudraBossHelper.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/miniboss/DailyMiniBossHelper.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/EnigmaSoulWaypoints.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/ParkourHelper.kt4
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/