Backend: Change Java to Kotlin for repo files (#1543)

67 files changed, 386 insertions, 638 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;
-    }