diff options
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/garden')
5 files changed, 12 insertions, 12 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt index da461d749..24edf8d43 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt @@ -372,8 +372,8 @@ object FarmingWeightDisplay { private fun isEtaEnabled() = config.overtakeETA fun addCrop(crop: CropType, addedCounter: Int) { - //Prevent div-by-0 errors - if (addedCounter == 0) return; + // Prevent div-by-0 errors + if (addedCounter == 0) return val before = getExactWeight() localCounter[crop] = crop.getLocalCounter() + addedCounter diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt index 959ab43e4..e8b2d55e4 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt @@ -112,8 +112,8 @@ object CaptureFarmingGear { val currentCrop = itemStack.getCropType() if (currentCrop == null) { - //todo better fall back items - //todo Daedalus axe + // todo better fall back items + // todo Daedalus axe } else { currentCrop.farmingItem.setItem(itemStack) } diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt index c002284ab..b05acf959 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt @@ -21,7 +21,7 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7 update(content, footer) } - //TODO split up this 240 lines function + // TODO split up this 240 lines function fun getPage(): Pair<List<List<Renderable>>, List<Renderable>> { val content = mutableListOf<MutableList<Renderable>>() val footer = mutableListOf<Renderable>() diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorCompactChat.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorCompactChat.kt index c1b6a3d8f..52e49d26f 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorCompactChat.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorCompactChat.kt @@ -82,10 +82,10 @@ object GardenVisitorCompactChat { visitorNameFormatted = "$visitorColor$visitorName" } - //If visitor name has not yet been matched, we aren't looking at a visitor accept message, and can ignore this. - if (visitorNameFormatted.isBlank()) return; + // If visitor name has not yet been matched, we aren't looking at a visitor accept message, and can ignore this. + if (visitorNameFormatted.isBlank()) return - //Match rewards and transform + // Match rewards and transform visitorRewardPattern.matchMatcher(transformedMessage) { val rewardColor = groupOrNull("rewardcolor") val amountColor = groupOrNull("amountcolor") @@ -105,7 +105,7 @@ object GardenVisitorCompactChat { if (altAmount == null) "" else "$altAmount " } - //Don't add name for copper, farming XP, garden XP, or bits + // Don't add name for copper, farming XP, garden XP, or bits val rewardString = if (discardRewardNamePattern.matcher(reward).matches()) "" else reward rewardsList.add( @@ -127,8 +127,8 @@ object GardenVisitorCompactChat { } private fun sendCompact() { - //This prevents commission rewards, crop milestone data, etc. from triggering incorrectly - if (visitorNameFormatted.isBlank()) return; + // This prevents commission rewards, crop milestone data, etc. from triggering incorrectly + if (visitorNameFormatted.isBlank()) return if (visitorAcceptedChat.isNotEmpty()) { ChatUtils.hoverableChat(createCompactVisitorMessage(), hover = visitorAcceptedChat, prefix = false) diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorDropStatistics.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorDropStatistics.kt index 6b3620c18..152fc1b7c 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorDropStatistics.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorDropStatistics.kt @@ -228,7 +228,7 @@ object GardenVisitorDropStatistics { return "$amount" } - //todo this should just save when changed not once a second + // todo this should just save when changed not once a second @SubscribeEvent fun onSecondPassed(event: SecondPassedEvent) { saveAndUpdate() |