diff options
author | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-06-23 00:49:38 +0200 |
---|---|---|
committer | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-06-23 00:49:38 +0200 |
commit | a1efe2d469bfe9e152ffcae4cd42dd9e98818c0f (patch) | |
tree | 389ec57474a64e815d40bb20116bd577ce1a0c7a /src/main | |
parent | 649e7ecd4c601d05d51c1decab91675e77e99ef9 (diff) | |
download | skyhanni-a1efe2d469bfe9e152ffcae4cd42dd9e98818c0f.tar.gz skyhanni-a1efe2d469bfe9e152ffcae4cd42dd9e98818c0f.tar.bz2 skyhanni-a1efe2d469bfe9e152ffcae4cd42dd9e98818c0f.zip |
formatting changes
Diffstat (limited to 'src/main')
3 files changed, 20 insertions, 13 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java b/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java index e9def2a1c..8d15a46df 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java @@ -543,7 +543,7 @@ public class Misc { public boolean hideMessages = false; @Expose - public Position glacialDropPos = new Position(10, 80, false, true); + public Position position = new Position(10, 80, false, true); } @Expose diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/FrozenTreasure.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/FrozenTreasure.kt index d18b65983..e2c70cedc 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/FrozenTreasure.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/FrozenTreasure.kt @@ -1,14 +1,19 @@ package at.hannibal2.skyhanni.features.misc -enum class FrozenTreasure (val internalName: String, val displayName: String, val defaultAmount: Int, val iceMultiplier: Int = 0){ +enum class FrozenTreasure( + val internalName: String, + val displayName: String, + val defaultAmount: Int, + val iceMultiplier: Int = 0, +) { WHITE_GIFT("WHITE_GIFT", "§fWhite Gift", 1), - GREEN_GIFT("GREEN_GIFT", "§aGreen Gift",1), - RED_GIFT("RED_GIFT","§9§cRed Gift", 1), - PACKED_ICE("PACKED_ICE","§fPacked Ice", 32, 9), - ENCHANTED_ICE("ENCHANTED_ICE","§aEnchanted Ice", 9, 160), // wiki says 1-16 so assuming 9 - ENCHANTED_PACKED_ICE("ENCHANTED_PACKED_ICE", "§9Enchanted Packed Ice",1, 25600), - ICE_BAIT("ICE_BAIT","§aIce Bait", 16), - GLOWY_CHUM_BAIT("GLOWY_CHUM_BAIT", "§aGlowy Chum Bait",16), - GLACIAL_FRAGMENT("GLACIAL_FRAGMENT","§5Glacial Fragment", 1), - GLACIAL_TALISMAN("GLACIAL_TALISMAN", "§fGlacial Talisman",1) + GREEN_GIFT("GREEN_GIFT", "§aGreen Gift", 1), + RED_GIFT("RED_GIFT", "§9§cRed Gift", 1), + PACKED_ICE("PACKED_ICE", "§fPacked Ice", 32, 9), + ENCHANTED_ICE("ENCHANTED_ICE", "§aEnchanted Ice", 9, 160), // wiki says 1-16 so assuming 9 + ENCHANTED_PACKED_ICE("ENCHANTED_PACKED_ICE", "§9Enchanted Packed Ice", 1, 25600), + ICE_BAIT("ICE_BAIT", "§aIce Bait", 16), + GLOWY_CHUM_BAIT("GLOWY_CHUM_BAIT", "§aGlowy Chum Bait", 16), + GLACIAL_FRAGMENT("GLACIAL_FRAGMENT", "§5Glacial Fragment", 1), + GLACIAL_TALISMAN("GLACIAL_TALISMAN", "§fGlacial Talisman", 1) }
\ No newline at end of file diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/FrozenTreasureTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/FrozenTreasureTracker.kt index 2022713b5..10c2f0bd6 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/FrozenTreasureTracker.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/FrozenTreasureTracker.kt @@ -132,6 +132,7 @@ class FrozenTreasureTracker { if (amount is Long) return NumberUtil.format(amount) return "$amount" } + private fun saveAndUpdate() { val hidden = ProfileStorageData.profileSpecific?.frozenTreasureTracker ?: return hidden.treasuresMined = treasuresMined @@ -155,9 +156,10 @@ class FrozenTreasureTracker { if (!config.enabled) return if (!onJerryWorkshop()) return if (config.onlyInCave && !inGlacialCave()) return - config.glacialDropPos.renderStringsAndItems(display, posLabel = "Visitor Stats") + config.position.renderStringsAndItems(display, posLabel = "Visitor Stats") } - private fun onJerryWorkshop() = LorenzUtils.inSkyBlock && LorenzUtils.skyBlockIsland == IslandType.WINTER + private fun onJerryWorkshop() = LorenzUtils.inIsland(IslandType.WINTER) + private fun inGlacialCave() = onJerryWorkshop() && ScoreboardData.sidebarLinesFormatted.contains(" §7⏣ §3Glacial Cave") }
\ No newline at end of file |