From ed0489539902d77595625aaa3bca4e328e1f7e88 Mon Sep 17 00:00:00 2001 From: BigloBot <95036804+BigloBot@users.noreply.github.com> Date: Sat, 4 May 2024 23:11:16 +0100 Subject: 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> --- src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHud.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main') 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: (?[\\d,]+) .+"); - private static final Pattern FARMING_XP = Pattern.compile("§3\\+(?\\d+.?\\d*) Farming \\((?\\d+.?\\d*)%\\)"); + private static final Pattern FARMING_XP = Pattern.compile("§3\\+(?\\d+.?\\d*) Farming \\((?[\\d,]+.?\\d*)%\\)"); private static final Deque counter = new ArrayDeque<>(); private static final LongPriorityQueue blockBreaks = new LongArrayFIFOQueue(); private static final Queue 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 } } -- cgit