aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorBigloBot <95036804+BigloBot@users.noreply.github.com>2024-05-04 23:11:16 +0100
committerGitHub <noreply@github.com>2024-05-05 00:11:16 +0200
commited0489539902d77595625aaa3bca4e328e1f7e88 (patch)
treef992cae47b25ec3bfd9f620dbe7c0ea52634ae4a /src/main
parent37ad3ca7aa844bf0db54e7ee21e35837fd3cbbc1 (diff)
downloadSkyblocker-ed0489539902d77595625aaa3bca4e328e1f7e88.tar.gz
Skyblocker-ed0489539902d77595625aaa3bca4e328e1f7e88.tar.bz2
Skyblocker-ed0489539902d77595625aaa3bca4e328e1f7e88.zip
Fixes to Garden UI (#682)
* Fix Garden UI * Update src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHud.java Co-authored-by: Kevin <92656833+kevinthegreat1@users.noreply.github.com> * Update src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHud.java Co-authored-by: Kevin <92656833+kevinthegreat1@users.noreply.github.com> --------- Co-authored-by: Kevin <92656833+kevinthegreat1@users.noreply.github.com>
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHud.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHud.java b/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHud.java
index 95c72241..fe93813f 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHud.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHud.java
@@ -34,7 +34,7 @@ public class FarmingHud {
private static final Logger LOGGER = LoggerFactory.getLogger(FarmingHud.class);
public static final NumberFormat NUMBER_FORMAT = NumberFormat.getInstance(Locale.US);
private static final Pattern COUNTER = Pattern.compile("Counter: (?<count>[\\d,]+) .+");
- private static final Pattern FARMING_XP = Pattern.compile("§3\\+(?<xp>\\d+.?\\d*) Farming \\((?<percent>\\d+.?\\d*)%\\)");
+ private static final Pattern FARMING_XP = Pattern.compile("§3\\+(?<xp>\\d+.?\\d*) Farming \\((?<percent>[\\d,]+.?\\d*)%\\)");
private static final Deque<IntLongPair> counter = new ArrayDeque<>();
private static final LongPriorityQueue blockBreaks = new LongArrayFIFOQueue();
private static final Queue<FloatLongPair> farmingXp = new ArrayDeque<>();
@@ -118,6 +118,6 @@ public class FarmingHud {
}
public static double farmingXpPerHour() {
- return farmingXp.stream().mapToDouble(FloatLongPair::leftFloat).sum() * 3600;
+ return farmingXp.stream().mapToDouble(FloatLongPair::leftFloat).sum() * blockBreaks() * 1800; // Hypixel only sends xp updates around every half a second
}
}