aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal00212@users.noreply.github.com>2024-06-09 19:45:39 +0200
committerhannibal2 <24389977+hannibal00212@users.noreply.github.com>2024-06-09 19:45:39 +0200
commit156cf6d8b6a46a5d0d3eb6b00cb2b87a626f276e (patch)
tree057c3626c3944160262e422e061d080b33d0b048
parentcc629382945460d48fc9fa6472106df9fcbb589d (diff)
downloadskyhanni-156cf6d8b6a46a5d0d3eb6b00cb2b87a626f276e.tar.gz
skyhanni-156cf6d8b6a46a5d0d3eb6b00cb2b87a626f276e.tar.bz2
skyhanni-156cf6d8b6a46a5d0d3eb6b00cb2b87a626f276e.zip
removed trailing commas on call site, and added many missing trailing commas on json objects
-rw-r--r--.editorconfig2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/local/HotmTree.kt8
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/other/EliteBotJson.kt14
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/other/HypixelPlayerApiJson.kt15
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/other/SkyblockItemsDataJson.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/AnitaUpgradeCostsJson.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ArmorDropsJson.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ArrowTypeJson.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/BeltsJson.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/BingoJson.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/BingoRanksJson.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/CrimsonIsleReputationJson.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DanceRoomInstructionsJson.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DianaDropsJson.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DicerDropsJson.kt6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DisabledFeaturesJson.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/EnigmaSoulsJson.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/EventWaypointsJson.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/FameRankJson.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/FishingProfitItemsJson.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/GardenJson.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/HideNotClickableItemsJson.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/InfernoMinionFuelsJson.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/LocationFixJson.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/MaxwellPowersJson.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/MinionXPJson.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ModGuiSwitcherJson.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ParkourJson.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/PlayerChatFilterJson.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/RiftEffigiesJson.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/SeaCreatureJson.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/SlayerProfitTrackerItemsJson.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/StackingEnchantsJson.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/VipVisitsJson.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/WarpsJson.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/neu/NeuHoppityJson.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/neu/NeuRNGScore.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/neu/NeuReforgeStoneJson.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/neu/NeuSacksJson.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/neu/NeuSkillLevelJson.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/EstimatedWardrobePrice.kt1
41 files changed, 71 insertions, 73 deletions
diff --git a/.editorconfig b/.editorconfig
index faff54218..60315ee75 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -32,7 +32,7 @@ ktlint_code_style = intellij_idea
ij_kotlin_name_count_to_use_star_import = 2147483647
ij_kotlin_name_count_to_use_star_import_for_members = 2147483647
ij_kotlin_enum_constants_wrap = split_into_lines
-ij_kotlin_allow_trailing_comma_on_call_site = true
+ij_kotlin_allow_trailing_comma_on_call_site = false
ij_kotlin_allow_trailing_comma = true
ktlint_standard_multiline-if-else = disabled
diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/local/HotmTree.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/local/HotmTree.kt
index 3c0118089..b1635144a 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/local/HotmTree.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/local/HotmTree.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.data.jsonobjects.local;
+package at.hannibal2.skyhanni.data.jsonobjects.local
import at.hannibal2.skyhanni.utils.json.fromJson
import com.google.gson.Gson
@@ -7,11 +7,11 @@ import com.google.gson.annotations.Expose
class HotmTree {
@Expose
- val perks = mutableMapOf<String, HotmPerk>();
+ val perks = mutableMapOf<String, HotmPerk>()
fun deepCopy(): HotmTree {
- val gson = Gson();
- val json = gson.toJson(this);
+ val gson = Gson()
+ val json = gson.toJson(this)
return gson.fromJson<HotmTree>(json)
}
diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/other/EliteBotJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/other/EliteBotJson.kt
index 2f2543f56..5da9a9629 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/other/EliteBotJson.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/other/EliteBotJson.kt
@@ -7,7 +7,7 @@ import com.google.gson.annotations.SerializedName
data class ElitePlayerWeightJson(
@Expose val selectedProfileId: String,
- @Expose val profiles: List<WeightProfile>
+ @Expose val profiles: List<WeightProfile>,
)
data class WeightProfile(
@@ -17,30 +17,30 @@ data class WeightProfile(
@Expose val cropWeight: Map<CropType, Double>,
@Expose val bonusWeight: Map<String, Int>,
@Expose val uncountedCrops: Map<CropType, Int>,
- @Expose val pests: Map<PestType, Int>
+ @Expose val pests: Map<PestType, Int>,
)
data class EliteLeaderboardJson(
- @Expose val data: EliteLeaderboard
+ @Expose val data: EliteLeaderboard,
)
data class EliteLeaderboard(
@Expose val rank: Int,
@Expose val upcomingRank: Int,
- @Expose val upcomingPlayers: List<UpcomingLeaderboardPlayer>
+ @Expose val upcomingPlayers: List<UpcomingLeaderboardPlayer>,
)
data class UpcomingLeaderboardPlayer(
@Expose @SerializedName("ign") val name: String,
- @Expose @SerializedName("amount") val weight: Double
+ @Expose @SerializedName("amount") val weight: Double,
)
data class EliteWeightsJson(
@Expose val crops: Map<CropType, Double>,
- @Expose val pests: PestWeightData
+ @Expose val pests: PestWeightData,
)
data class PestWeightData(
@Expose val brackets: Map<Int, Int>,
- @Expose @SerializedName("values") val pestWeights: Map<PestType, Map<Int, Double>>
+ @Expose @SerializedName("values") val pestWeights: Map<PestType, Map<Int, Double>>,
)
diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/other/HypixelPlayerApiJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/other/HypixelPlayerApiJson.kt
index 47304433a..ee1f11bfc 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/other/HypixelPlayerApiJson.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/other/HypixelPlayerApiJson.kt
@@ -2,36 +2,35 @@ package at.hannibal2.skyhanni.data.jsonobjects.other
import com.google.gson.annotations.Expose
import com.google.gson.annotations.SerializedName
-import javax.annotation.Nullable
data class HypixelPlayerApiJson(
- @Expose val profiles: List<HypixelApiProfile>
+ @Expose val profiles: List<HypixelApiProfile>,
)
data class HypixelApiProfile(
@Expose val members: Map<String, HypixelApiPlayer>,
- @Expose @SerializedName("cute_name") val profileName: String
+ @Expose @SerializedName("cute_name") val profileName: String,
)
data class HypixelApiPlayer(
@Expose @SerializedName("trophy_fish") val trophyFish: HypixelApiTrophyFish,
- @Expose val events: HypixelApiEvents
+ @Expose val events: HypixelApiEvents,
)
data class HypixelApiEvents(
- @Expose val easter: HypixelApiEasterEvent
+ @Expose val easter: HypixelApiEasterEvent,
)
data class HypixelApiEasterEvent(
- @Expose val rabbits: HypixelApiRabbits
+ @Expose val rabbits: HypixelApiRabbits,
)
data class HypixelApiRabbits(
@Expose @SerializedName("collected_locations")
- val collectedLocations: Map<String, List<String>>
+ val collectedLocations: Map<String, List<String>>,
)
data class HypixelApiTrophyFish(
val totalCaught: Int,
- val caught: Map<String, Int>
+ val caught: Map<String, Int>,
)
diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/other/SkyblockItemsDataJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/other/SkyblockItemsDataJson.kt
index 0676a5e8e..65384848f 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/other/SkyblockItemsDataJson.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/other/SkyblockItemsDataJson.kt
@@ -4,11 +4,11 @@ import com.google.gson.annotations.Expose
import com.google.gson.annotations.SerializedName
data class SkyblockItemsDataJson(
- @Expose val items: List<SkyblockItemData>
+ @Expose val items: List<SkyblockItemData>,
)
data class SkyblockItemData(
@Expose val id: String?,
@Expose @SerializedName("npc_sell_price") val npcPrice: Double?,
- @Expose @SerializedName("motes_sell_price") val motesPrice: Double?
+ @Expose @SerializedName("motes_sell_price") val motesPrice: Double?,
)
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
index b2b688cf8..f4ced7e83 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/AnitaUpgradeCostsJson.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/AnitaUpgradeCostsJson.kt
@@ -4,10 +4,10 @@ import com.google.gson.annotations.Expose
import com.google.gson.annotations.SerializedName
data class AnitaUpgradeCostsJson(
- @Expose @SerializedName("level_price") val levelPrice: Map<Int, AnitaUpgradePrice>
+ @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
+ @Expose @SerializedName("jacob_tickets") val jacobTickets: Int,
)
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
index 5aebcd2ba..4441a37d5 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ArmorDropsJson.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ArmorDropsJson.kt
@@ -4,10 +4,10 @@ import com.google.gson.annotations.Expose
import com.google.gson.annotations.SerializedName
data class ArmorDropsJson(
- @Expose @SerializedName("special_crops") val specialCrops: Map<String, ArmorDropInfo>
+ @Expose @SerializedName("special_crops") val specialCrops: Map<String, ArmorDropInfo>,
)
data class ArmorDropInfo(
@Expose @SerializedName("armor_type") val armorType: String,
- @Expose val chance: List<Double>
+ @Expose val chance: List<Double>,
)
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
index 2ce05c838..1d8d6e1cf 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ArrowTypeJson.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ArrowTypeJson.kt
@@ -3,9 +3,9 @@ package at.hannibal2.skyhanni.data.jsonobjects.repo
import com.google.gson.annotations.Expose
data class ArrowTypeJson(
- @Expose val arrows: Map<String, ArrowAttributes>
+ @Expose val arrows: Map<String, ArrowAttributes>,
)
data class ArrowAttributes(
- @Expose val arrow: String
+ @Expose val arrow: String,
)
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
index 16eac4626..2cc4d4fe3 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/BeltsJson.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/BeltsJson.kt
@@ -3,5 +3,5 @@ package at.hannibal2.skyhanni.data.jsonobjects.repo
import com.google.gson.annotations.Expose
data class BeltsJson(
- @Expose val belts: Map<String, Int>
+ @Expose val belts: Map<String, Int>,
)
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
index 890a9838e..4078d917e 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/BingoJson.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/BingoJson.kt
@@ -4,12 +4,12 @@ import com.google.gson.annotations.Expose
import com.google.gson.annotations.SerializedName
data class BingoJson(
- @Expose @SerializedName("bingo_tips") val bingoTips: Map<String, BingoData>
+ @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
+ @Expose val found: String,
)
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
index c24285343..598e94ee8 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/BingoRanksJson.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/BingoRanksJson.kt
@@ -3,5 +3,5 @@ package at.hannibal2.skyhanni.data.jsonobjects.repo
import com.google.gson.annotations.Expose
data class BingoRanksJson(
- @Expose val ranks: Map<String, Int>
+ @Expose val ranks: Map<String, Int>,
)
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
index f25d6040c..c669a8eb3 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/CrimsonIsleReputationJson.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/CrimsonIsleReputationJson.kt
@@ -14,5 +14,5 @@ data class CrimsonIsleReputationJson(
data class ReputationQuest(
@Expose val item: NEUInternalName,
- @Expose val location: List<Double>
+ @Expose val location: List<Double>,
)
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
index 2c34478c6..991f0a15f 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DanceRoomInstructionsJson.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DanceRoomInstructionsJson.kt
@@ -3,5 +3,5 @@ package at.hannibal2.skyhanni.data.jsonobjects.repo
import com.google.gson.annotations.Expose
data class DanceRoomInstructionsJson(
- @Expose val instructions: List<String>
+ @Expose val instructions: List<String>,
)
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
index df515e14d..5bbdfde1d 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DianaDropsJson.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DianaDropsJson.kt
@@ -5,5 +5,5 @@ import com.google.gson.annotations.Expose
import com.google.gson.annotations.SerializedName
data class DianaDropsJson(
- @Expose @SerializedName("diana_drops") val dianaDrops: List<NEUInternalName>
+ @Expose @SerializedName("diana_drops") val dianaDrops: List<NEUInternalName>,
)
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
index 86cd684b8..ef36a9323 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DicerDropsJson.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DicerDropsJson.kt
@@ -5,15 +5,15 @@ import com.google.gson.annotations.SerializedName
class DicerDropsJson(
@Expose val MELON: DicerType,
- @Expose val PUMPKIN: DicerType
+ @Expose val PUMPKIN: DicerType,
)
data class DicerType(
@Expose @SerializedName("total chance") val totalChance: Int,
- @Expose val drops: List<DropInfo>
+ @Expose val drops: List<DropInfo>,
)
data class DropInfo(
@Expose val chance: Int,
- @Expose val amount: List<Int>
+ @Expose val amount: List<Int>,
)
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
index bcc4753ac..a393dfe9a 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DisabledFeaturesJson.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DisabledFeaturesJson.kt
@@ -3,5 +3,5 @@ package at.hannibal2.skyhanni.data.jsonobjects.repo
import com.google.gson.annotations.Expose
data class DisabledFeaturesJson(
- @Expose val features: Map<String, Boolean>
+ @Expose val features: Map<String, Boolean>,
)
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
index a458f04ae..d26cd1aaa 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/EnigmaSoulsJson.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/EnigmaSoulsJson.kt
@@ -4,10 +4,10 @@ import at.hannibal2.skyhanni.utils.LorenzVec
import com.google.gson.annotations.Expose
data class EnigmaSoulsJson(
- @Expose val areas: Map<String, List<EnigmaPosition>>
+ @Expose val areas: Map<String, List<EnigmaPosition>>,
)
data class EnigmaPosition(
@Expose val name: String,
- @Expose val position: LorenzVec
+ @Expose val position: LorenzVec,
)
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
index b5548ef1e..604fc2f3e 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/EventWaypointsJson.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/EventWaypointsJson.kt
@@ -6,10 +6,10 @@ 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>>
+ @Expose @SerializedName("presents_entrances") val presentsEntrances: Map<String, List<EventWaypointData>>,
)
data class EventWaypointData(
@Expose val name: String,
- @Expose val position: LorenzVec
+ @Expose val position: LorenzVec,
)
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
index b5d9dddcc..59da76776 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/FameRankJson.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/FameRankJson.kt
@@ -4,12 +4,12 @@ import com.google.gson.annotations.Expose
import com.google.gson.annotations.SerializedName
data class FameRankJson(
- @Expose @SerializedName("fame_rank") val fameRank: Map<String, FameRank>
+ @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
+ @Expose val votes: Int,
)
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
index 224cc7f4d..96956bc92 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/FishingProfitItemsJson.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/FishingProfitItemsJson.kt
@@ -4,5 +4,5 @@ import at.hannibal2.skyhanni.utils.NEUInternalName
import com.google.gson.annotations.Expose
data class FishingProfitItemsJson(
- @Expose val categories: Map<String, List<NEUInternalName>>
+ @Expose val categories: Map<String, List<NEUInternalName>>,
)
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
index 4f922dfa2..a6c7b84a2 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/GardenJson.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/GardenJson.kt
@@ -13,7 +13,7 @@ data class GardenJson(
@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>
+ @Expose val fuel: Map<NEUInternalName, Double>,
)
data class GardenVisitor(
@@ -22,5 +22,5 @@ data class GardenVisitor(
@Expose val position: LorenzVec?,
@Expose var skinOrType: String?,
@Expose val mode: String,
- @Expose @SerializedName("need_items") val needItems: List<String>
+ @Expose @SerializedName("need_items") val needItems: List<String>,
)
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
index e8a8ba804..b8d0d7c28 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/HideNotClickableItemsJson.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/HideNotClickableItemsJson.kt
@@ -13,5 +13,5 @@ data class HideNotClickableItemsJson(
data class SalvageFilter(
@Expose val armor: List<String>,
- @Expose val items: List<String>
+ @Expose val items: List<String>,
)
diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/InfernoMinionFuelsJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/InfernoMinionFuelsJson.kt
index d6d3931c2..45b09dabf 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/InfernoMinionFuelsJson.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/InfernoMinionFuelsJson.kt
@@ -5,5 +5,5 @@ import com.google.gson.annotations.Expose
import com.google.gson.annotations.SerializedName
data class InfernoMinionFuelsJson(
- @Expose @SerializedName("inferno_minion_fuels") val minionFuels: List<NEUInternalName>
+ @Expose @SerializedName("inferno_minion_fuels") val minionFuels: List<NEUInternalName>,
)
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
index bc4e8552c..c2662a02b 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/LocationFixJson.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/LocationFixJson.kt
@@ -5,7 +5,7 @@ import com.google.gson.annotations.Expose
import com.google.gson.annotations.SerializedName
data class LocationFixJson(
- @Expose val locationFixes: Map<String, LocationFix>
+ @Expose val locationFixes: Map<String, LocationFix>,
)
data class LocationFix(
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
index 366324a09..779960189 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/MaxwellPowersJson.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/MaxwellPowersJson.kt
@@ -3,5 +3,5 @@ package at.hannibal2.skyhanni.data.jsonobjects.repo
import com.google.gson.annotations.Expose
data class MaxwellPowersJson(
- @Expose val powers: MutableList<String>
+ @Expose val powers: MutableList<String>,
)
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
index bab62509d..6a8aa199f 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/MinionXPJson.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/MinionXPJson.kt
@@ -4,5 +4,5 @@ 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>>
+ @Expose @SerializedName("minion_xp") val minionXp: Map<String, Map<String, Double>>,
)
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
index 2789abd1d..7532608b7 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ModGuiSwitcherJson.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ModGuiSwitcherJson.kt
@@ -3,11 +3,11 @@ package at.hannibal2.skyhanni.data.jsonobjects.repo
import com.google.gson.annotations.Expose
data class ModGuiSwitcherJson(
- @Expose val mods: Map<String, OtherModInfo>
+ @Expose val mods: Map<String, OtherModInfo>,
)
data class OtherModInfo(
@Expose val description: List<String>,
@Expose val command: String,
- @Expose val guiPath: List<String>
+ @Expose val guiPath: List<String>,
)
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
index 42f2861b0..686a33af1 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ParkourJson.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ParkourJson.kt
@@ -5,10 +5,10 @@ import com.google.gson.annotations.Expose
data class ParkourJson(
@Expose val locations: List<LorenzVec>,
- @Expose val shortCuts: List<ParkourShortCut> = listOf()
+ @Expose val shortCuts: List<ParkourShortCut> = listOf(),
)
data class ParkourShortCut(
@Expose val from: Int,
- @Expose val to: Int
+ @Expose val to: Int,
)
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
index 51d9de94d..0749c5305 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/PlayerChatFilterJson.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/PlayerChatFilterJson.kt
@@ -3,5 +3,5 @@ package at.hannibal2.skyhanni.data.jsonobjects.repo
import com.google.gson.annotations.Expose
data class PlayerChatFilterJson(
- @Expose val filters: List<MultiFilterJson>
+ @Expose val filters: List<MultiFilterJson>,
)
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
index 4fd2b1853..5cc121c11 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/RiftEffigiesJson.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/RiftEffigiesJson.kt
@@ -4,5 +4,5 @@ import at.hannibal2.skyhanni.utils.LorenzVec
import com.google.gson.annotations.Expose
data class RiftEffigiesJson(
- @Expose val locations: List<LorenzVec>
+ @Expose val locations: List<LorenzVec>,
)
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
index 79a64fee1..e49ed4e44 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/SeaCreatureJson.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/SeaCreatureJson.kt
@@ -8,7 +8,7 @@ import java.lang.reflect.Type
data class SeaCreatureJson(
@Expose @SerializedName("chat_color") val chatColor: String,
- @Expose @SerializedName("sea_creatures") val seaCreatures: Map<String, SeaCreatureInfo>
+ @Expose @SerializedName("sea_creatures") val seaCreatures: Map<String, SeaCreatureInfo>,
) {
companion object {
val TYPE: Type = object : TypeToken<Map<String?, SeaCreatureJson>>() {
@@ -20,5 +20,5 @@ 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
+ @Expose val rarity: LorenzRarity,
)
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
index 0449f3fb3..118ee4795 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/SlayerProfitTrackerItemsJson.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/SlayerProfitTrackerItemsJson.kt
@@ -4,5 +4,5 @@ import at.hannibal2.skyhanni.utils.NEUInternalName
import com.google.gson.annotations.Expose
data class SlayerProfitTrackerItemsJson(
- @Expose val slayers: Map<String, List<NEUInternalName>>
+ @Expose val slayers: Map<String, List<NEUInternalName>>,
)
diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/StackingEnchantsJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/StackingEnchantsJson.kt
index a663f6db8..876ff946b 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/StackingEnchantsJson.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/StackingEnchantsJson.kt
@@ -3,10 +3,10 @@ package at.hannibal2.skyhanni.data.jsonobjects.repo
import com.google.gson.annotations.Expose
data class StackingEnchantsJson(
- @Expose val enchants: Map<String, StackingEnchantData>
+ @Expose val enchants: Map<String, StackingEnchantData>,
)
data class StackingEnchantData(
@Expose val levels: List<Int>,
- @Expose val statName: String
+ @Expose val statName: String,
)
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
index a6bb541d3..1cc8b2602 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/VipVisitsJson.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/VipVisitsJson.kt
@@ -3,5 +3,5 @@ package at.hannibal2.skyhanni.data.jsonobjects.repo
import com.google.gson.annotations.Expose
data class VipVisitsJson(
- @Expose val vipVisits: List<String>
+ @Expose val vipVisits: List<String>,
)
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
index 6fe3d990b..0820f5b9c 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/WarpsJson.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/WarpsJson.kt
@@ -3,5 +3,5 @@ package at.hannibal2.skyhanni.data.jsonobjects.repo
import com.google.gson.annotations.Expose
data class WarpsJson(
- @Expose val warpCommands: List<String>
+ @Expose val warpCommands: List<String>,
)
diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/neu/NeuHoppityJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/neu/NeuHoppityJson.kt
index 1c80f6ad3..ada6afaa1 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/neu/NeuHoppityJson.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/neu/NeuHoppityJson.kt
@@ -3,7 +3,7 @@ package at.hannibal2.skyhanni.data.jsonobjects.repo.neu
import com.google.gson.annotations.Expose
data class NeuHoppityJson(
- @Expose val hoppity: HoppityInfo
+ @Expose val hoppity: HoppityInfo,
)
data class HoppityInfo(
diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/neu/NeuRNGScore.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/neu/NeuRNGScore.kt
index d63a9ae79..a2df8a095 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/neu/NeuRNGScore.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/neu/NeuRNGScore.kt
@@ -5,5 +5,5 @@ import com.google.gson.annotations.Expose
data class NeuRNGScore(
@Expose val catacombs: Map<String, Map<NEUInternalName, Long>>,
- @Expose val slayer: Map<String, Map<NEUInternalName, Long>>
+ @Expose val slayer: Map<String, Map<NEUInternalName, Long>>,
)
diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/neu/NeuReforgeStoneJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/neu/NeuReforgeStoneJson.kt
index c450e3910..8ebe2dea6 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/neu/NeuReforgeStoneJson.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/neu/NeuReforgeStoneJson.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.data.jsonobjects.repo.neu;
+package at.hannibal2.skyhanni.data.jsonobjects.repo.neu
import at.hannibal2.skyhanni.utils.LorenzRarity
import at.hannibal2.skyhanni.utils.NEUInternalName
diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/neu/NeuSacksJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/neu/NeuSacksJson.kt
index fe0ae5b49..481c4f76b 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/neu/NeuSacksJson.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/neu/NeuSacksJson.kt
@@ -4,10 +4,10 @@ import at.hannibal2.skyhanni.utils.NEUInternalName
import com.google.gson.annotations.Expose
data class NeuSacksJson(
- @Expose val sacks: Map<String, SackInfo>
+ @Expose val sacks: Map<String, SackInfo>,
)
data class SackInfo(
@Expose val item: NEUInternalName,
- @Expose val contents: List<NEUInternalName>
+ @Expose val contents: List<NEUInternalName>,
)
diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/neu/NeuSkillLevelJson.kt b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/neu/NeuSkillLevelJson.kt
index d8ac8c838..ce50c4fe4 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/neu/NeuSkillLevelJson.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/neu/NeuSkillLevelJson.kt
@@ -4,5 +4,5 @@ import com.google.gson.annotations.Expose
import com.google.gson.annotations.SerializedName
data class NeuSkillLevelJson(
- @Expose @SerializedName("leveling_xp") val levelingXp: List<Int>
+ @Expose @SerializedName("leveling_xp") val levelingXp: List<Int>,
)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/EstimatedWardrobePrice.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/EstimatedWardrobePrice.kt
index d55b30cf1..82acccf49 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/EstimatedWardrobePrice.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/wardrobe/EstimatedWardrobePrice.kt
@@ -20,7 +20,6 @@ object EstimatedWardrobePrice {
event.slot.slotNumber == it.inventorySlot && it.isInCurrentPage()
} ?: return
-
val lore = WardrobeAPI.createPriceLore(slot)
if (lore.isEmpty()) return