aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal002@users.noreply.github.com>2024-05-13 12:00:07 +0200
committerGitHub <noreply@github.com>2024-05-13 12:00:07 +0200
commitda3c40aa2c9826ccda25b79f32449233981f9bfe (patch)
treecf9c196677be79dfee201c232084aa203810bd00 /src/main/java
parentb0720fae706bad2571039222f4aeba26f996cbdb (diff)
downloadskyhanni-da3c40aa2c9826ccda25b79f32449233981f9bfe.tar.gz
skyhanni-da3c40aa2c9826ccda25b79f32449233981f9bfe.tar.bz2
skyhanni-da3c40aa2c9826ccda25b79f32449233981f9bfe.zip
Improvement: Crops per second/per hour (#1536)
Co-authored-by: HiZe <superhize@hotmail.com> Co-authored-by: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com> Co-authored-by: alexia <me@alexia.lol> Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/garden/cropmilestones/CropMilestonesConfig.java2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt11
2 files changed, 11 insertions, 2 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/cropmilestones/CropMilestonesConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/cropmilestones/CropMilestonesConfig.java
index abc256c97..9d124f988 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/cropmilestones/CropMilestonesConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/cropmilestones/CropMilestonesConfig.java
@@ -116,7 +116,9 @@ public class CropMilestonesConfig {
MILESTONE_TIER("§7Pumpkin Tier 22", 1),
NUMBER_OUT_OF_TOTAL("§e12,300§8/§e100,000", 2),
TIME("§7In §b12m 34s", 3),
+ CROPS_PER_SECOND("§7Crops/Second§8: §e205.75"),
CROPS_PER_MINUTE("§7Crops/Minute§8: §e12,345", 4),
+ CROPS_PER_HOUR("§7Crops/Hour§8: §e740,700"),
BLOCKS_PER_SECOND("§7Blocks/Second§8: §e19.85", 5),
PERCENTAGE("§7Percentage: §e12.34%", 6),
;
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt
index 44fa5f7a1..72021eea6 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt
@@ -213,8 +213,15 @@ object GardenCropMilestoneDisplay {
}
}
- val format = (farmingFortuneSpeed * 60).addSeparators()
- lineMap[MilestoneTextEntry.CROPS_PER_MINUTE] = Renderable.string("§7Crops/Minute§8: §e$format")
+ val secondFormat = (farmingFortuneSpeed).addSeparators()
+ lineMap[MilestoneTextEntry.CROPS_PER_SECOND] = Renderable.string("§7Crops/Second§8: §e$secondFormat")
+
+ val minuteFormat = (farmingFortuneSpeed * 60).addSeparators()
+ lineMap[MilestoneTextEntry.CROPS_PER_MINUTE] = Renderable.string("§7Crops/Minute§8: §e$minuteFormat")
+
+ val hourFormat = (farmingFortuneSpeed * 60 * 60).addSeparators()
+ lineMap[MilestoneTextEntry.CROPS_PER_HOUR] = Renderable.string("§7Crops/Hour§8: §e$hourFormat")
+
val formatBps = speed.round(config.blocksBrokenPrecision).addSeparators()
lineMap[MilestoneTextEntry.BLOCKS_PER_SECOND] = Renderable.string("§7Blocks/Second§8: §e$formatBps")
}