Skip to content

Minor Farming Hud Fixes #2223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Alex33856 merged 2 commits into from
Mar 14, 2026
Merged

Minor Farming Hud Fixes #2223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f58c3b4
Minor Farming Hud Fixes
Alex33856 Mar 11, 2026
23d64e1
this too I guess
Alex33856 Mar 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHud.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,13 @@
import it.unimi.dsi.fastutil.longs.LongLongPair;
import it.unimi.dsi.fastutil.longs.LongPriorityQueue;
import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
import net.fabricmc.fabric.api.client.message.v1.ClientReceiveMessageEvents;
import net.fabricmc.fabric.api.client.rendering.v1.hud.HudElementRegistry;
import net.fabricmc.fabric.api.client.rendering.v1.hud.VanillaHudElements;
import net.fabricmc.fabric.api.event.client.player.ClientPlayerBlockBreakEvents;
import net.minecraft.ChatFormatting;
import net.minecraft.client.Minecraft;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.NumericTag;
import net.minecraft.resources.Identifier;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.block.Blocks;
import org.slf4j.Logger;
Expand All @@ -41,7 +39,6 @@

public class FarmingHud {
private static final Logger LOGGER = LoggerFactory.getLogger(FarmingHud.class);
private static final Identifier FARMING_HUD = SkyblockerMod.id("farming_hud");
public static final NumberFormat NUMBER_FORMAT = NumberFormat.getInstance(Locale.US);
private static final Pattern FARMING_XP = Pattern.compile("\\+(?<xp>\\d+(?:\\.\\d+)?) Farming \\((?<percent>[\\d,]+(?:\\.\\d+)?%|[\\d,]+/[\\d,]+)\\)");
private static final Minecraft client = Minecraft.getInstance();
Expand All @@ -56,7 +53,7 @@ public class FarmingHud {

@Init
public static void init() {
HudElementRegistry.attachElementAfter(VanillaHudElements.STATUS_EFFECTS, FARMING_HUD, (context, tickCounter) -> {
ClientTickEvents.END_CLIENT_TICK.register(_minecraft -> {
if (shouldRender()) {
if (!counter.isEmpty() && counter.peek().rightLong() + STATS_WINDOW < System.currentTimeMillis()) {
counter.poll();
Expand Down Expand Up @@ -88,7 +85,7 @@ public static void init() {
if (!newState.isAir() || !oldState.is(Blocks.CACTUS)) return; // Cactus was replaced with air
if (!client.level.getBlockState(pos.below()).is(Blocks.CACTUS)) return; // Don't count any blocks above one that was broken.
if (client.player.distanceToSqr(pos.getX(), pos.getY(), pos.getZ()) > 64) return; // check if within 8 blocks of the player
if (!client.player.getMainHandItem().getNeuName().equals("CACTUS_KNIFE")) return;
if (!client.player.getMainHandItem().getNeuName().startsWith("CACTUS_KNIFE")) return;
blockBreaks.enqueue(System.currentTimeMillis());
});

Expand All @@ -111,6 +108,7 @@ public static void init() {
.executes(Scheduler.queueOpenScreenCommand(() -> new WidgetsConfigurationScreen(Location.GARDEN, "hud_garden", null)))))));
}

@SuppressWarnings("SameParameterValue")
private static boolean tryGetCounter(ItemStack stack, CounterType counterType) {
CompoundTag customData = ItemUtils.getCustomData(stack);
if (customData.isEmpty() || !(customData.get(counterType.nbtKey) instanceof NumericTag)) return true;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/de/hysky/skyblocker/skyblock/tabhud/config/WidgetsConfigurationScreen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ public WidgetsConfigurationScreen(ChestMenu handler, String titleLowercase) {
* @param targetLocation open the preview to this location
* @param widgetLayerToGoTo go to this widget's layer
*/
public WidgetsConfigurationScreen(Location targetLocation, String widgetLayerToGoTo, Screen parent) {
public WidgetsConfigurationScreen(Location targetLocation, String widgetLayerToGoTo, @Nullable Screen parent) {
this(null, "", targetLocation, WidgetManager.getScreenBuilder(targetLocation).getPositionRuleOrDefault(widgetLayerToGoTo).screenLayer());
this.parent = parent;
}
Expand Down
Loading