Skip to content

Revamp Farming Config Category #2208

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
AzureAaron merged 10 commits into from
Mar 18, 2026
+3,244 −193
Merged

Revamp Farming Config Category #2208

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a7f6c07
Remove legacy Prevent Dicer Title feature
Alex33856 Mar 6, 2026
9e2beb2
Revamp Farming Config
Alex33856 Mar 6, 2026
f87578e
More wording changes
Alex33856 Mar 6, 2026
603c1f7
Data Fixer + Actual Config Changes
Alex33856 Mar 6, 2026
a27a1a9
rename localization strings
Alex33856 Mar 6, 2026
e1fe6b0
spotlessApply
Alex33856 Mar 6, 2026
748b409
oops
Alex33856 Mar 7, 2026
74653f6
preemptive move
Alex33856 Mar 12, 2026
1d9d3be
Merge master
Alex33856 Mar 12, 2026
b31823c
Update ConfigDataFixerTest
Alex33856 Mar 12, 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
76 changes: 43 additions & 33 deletions src/main/java/de/hysky/skyblocker/config/categories/FarmingCategory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,95 +21,105 @@ public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig
.id(SkyblockerMod.id("config/farming"))
.name(Component.translatable("skyblocker.config.farming"))

//Garden
// Farming Hud
.group(OptionGroup.createBuilder()
.name(Component.translatable("skyblocker.config.farming.garden"))
.collapsed(false)
.name(Component.translatable("skyblocker.config.farming.farmingHud"))
.collapsed(true)
.option(Option.<Boolean>createBuilder()
.name(Component.translatable("skyblocker.config.farming.garden.enableHud"))
.name(Component.translatable("skyblocker.config.farming.farmingHud.enableHud"))
.binding(defaults.farming.garden.farmingHud.enableHud,
() -> config.farming.garden.farmingHud.enableHud,
newValue -> config.farming.garden.farmingHud.enableHud = newValue)
.controller(ConfigUtils.createBooleanController())
.build())
.option(ButtonOption.createBuilder()
.name(Component.translatable("skyblocker.config.farming.garden.farmingHud"))
.name(Component.translatable("skyblocker.config.farming.farmingHud.config"))
.prompt(Component.translatable("text.skyblocker.open"))
.action(screen -> Minecraft.getInstance().setScreen(new WidgetsConfigurationScreen(Location.GARDEN, FarmingHudWidget.getInstance().getInternalID(), screen)))
.build())
.option(Option.<FarmingConfig.Type>createBuilder()
.name(Component.translatable("skyblocker.config.farming.garden.farmingHud.type"))
.description(Component.translatable("skyblocker.config.farming.garden.farmingHud.type.@Tooltip"))
.name(Component.translatable("skyblocker.config.farming.farmingHud.type"))
.description(Component.translatable("skyblocker.config.farming.farmingHud.type.@Tooltip"))
.binding(defaults.farming.garden.farmingHud.type,
() -> config.farming.garden.farmingHud.type,
newValue -> config.farming.garden.farmingHud.type = newValue)
.controller(ConfigUtils.createEnumController())
.build())
.build())
// Pest Highlighter
.group(OptionGroup.createBuilder()
.name(Component.translatable("skyblocker.config.farming.pestHighlighter"))
.collapsed(true)
.option(Option.<Boolean>createBuilder()
.name(Component.translatable("skyblocker.config.farming.garden.dicerTitlePrevent"))
.binding(defaults.farming.garden.dicerTitlePrevent,
() -> config.farming.garden.dicerTitlePrevent,
newValue -> config.farming.garden.dicerTitlePrevent = newValue)
.controller(ConfigUtils.createBooleanController())
.build())
.option(Option.<Boolean>createBuilder()
.name(Component.translatable("skyblocker.config.farming.garden.pestHighlighter"))
.description(Component.translatable("skyblocker.config.farming.garden.pestHighlighter.@Tooltip"))
.name(Component.translatable("skyblocker.config.farming.pestHighlighter.enable"))
.description(Component.translatable("skyblocker.config.farming.pestHighlighter.@Tooltip"))
.binding(defaults.farming.garden.pestHighlighter,
() -> config.farming.garden.pestHighlighter,
newValue -> config.farming.garden.pestHighlighter = newValue)
.controller(ConfigUtils.createBooleanController())
.build())
.option(Option.<Boolean>createBuilder()
.name(Component.translatable("skyblocker.config.farming.garden.vinylHighlighter"))
.description(Component.translatable("skyblocker.config.farming.garden.vinylHighlighter.@Tooltip"))
.name(Component.translatable("skyblocker.config.farming.pestHighlighter.stereoHarmony"))
.description(Component.translatable("skyblocker.config.farming.pestHighlighter.stereoHarmony.@Tooltip"))
.binding(defaults.farming.garden.vinylHighlighter,
() -> config.farming.garden.vinylHighlighter,
newValue -> config.farming.garden.vinylHighlighter = newValue)
.controller(ConfigUtils.createBooleanController())
.build())
.option(Option.<Boolean>createBuilder()
.name(Component.translatable("skyblocker.config.farming.garden.lockMouseTool"))
.name(Component.translatable("skyblocker.config.farming.pestHighlighter.stereoHarmony.contest"))
.description(Component.translatable("skyblocker.config.farming.pestHighlighter.stereoHarmony.contest.@Tooltip"))
.binding(defaults.farming.garden.enableStereoHarmonyHelperForContest,
() -> config.farming.garden.enableStereoHarmonyHelperForContest,
newValue -> config.farming.garden.enableStereoHarmonyHelperForContest = newValue)
.controller(ConfigUtils.createBooleanController())
.build())
.build())
// Mouse Lock
.group(OptionGroup.createBuilder()
.name(Component.translatable("skyblocker.config.farming.mouseLock"))
.collapsed(true)
.tags(Component.literal("camera lock"), Component.literal("sensitivity"), Component.literal("yaw pitch"))
.option(Option.<Boolean>createBuilder()
.name(Component.translatable("skyblocker.config.farming.mouseLock.lockMouseTool"))
.binding(defaults.farming.garden.lockMouseTool,
() -> config.farming.garden.lockMouseTool,
newValue -> config.farming.garden.lockMouseTool = newValue)
.controller(ConfigUtils.createBooleanController())
.build())
.option(Option.<Boolean>createBuilder()
.name(Component.translatable("skyblocker.config.farming.garden.lockMouseGround"))
.name(Component.translatable("skyblocker.config.farming.mouseLock.lockMouseGround"))
.binding(defaults.farming.garden.lockMouseGroundOnly,
() -> config.farming.garden.lockMouseGroundOnly,
newValue -> config.farming.garden.lockMouseGroundOnly = newValue)
.controller(ConfigUtils.createBooleanController())
.build())
.build())
// Garden Plots Widget
.group(OptionGroup.createBuilder()
.name(Component.translatable("skyblocker.config.farming.plotsWidget"))
.collapsed(true)
.option(Option.<Boolean>createBuilder()
.name(Component.translatable("skyblocker.config.farming.garden.gardenPlotsWidget"))
.description(Component.translatable("skyblocker.config.farming.garden.gardenPlotsWidget.@Tooltip"))
.name(Component.translatable("skyblocker.config.farming.plotsWidget.enable"))
.description(Component.translatable("skyblocker.config.farming.plotsWidget.enable.@Tooltip"))
.binding(defaults.farming.garden.gardenPlotsWidget,
() -> config.farming.garden.gardenPlotsWidget,
newValue -> config.farming.garden.gardenPlotsWidget = newValue)
.controller(ConfigUtils.createBooleanController())
.build())
.option(Option.<Boolean>createBuilder()
.name(Component.translatable("skyblocker.config.farming.garden.closeScreenOnPlotClick"))
.description(Component.translatable("skyblocker.config.farming.garden.closeScreenOnPlotClick.@Tooltip"))
.name(Component.translatable("skyblocker.config.farming.plotsWidget.closeScreenOnPlotClick"))
.description(Component.translatable("skyblocker.config.farming.plotsWidget.closeScreenOnPlotClick.@Tooltip"))
.binding(defaults.farming.garden.closeScreenOnPlotClick,
() -> config.farming.garden.closeScreenOnPlotClick,
newValue -> config.farming.garden.closeScreenOnPlotClick = newValue)
.controller(ConfigUtils.createBooleanController())
.build())
.option(Option.<Boolean>createBuilder()
.name(Component.translatable("skyblocker.config.farming.garden.enableStereoHarmonyHelperForContest"))
.description(Component.translatable("skyblocker.config.farming.garden.enableStereoHarmonyHelperForContest.@Tooltip"))
.binding(defaults.farming.garden.enableStereoHarmonyHelperForContest,
() -> config.farming.garden.enableStereoHarmonyHelperForContest,
newValue -> config.farming.garden.enableStereoHarmonyHelperForContest = newValue)
.controller(ConfigUtils.createBooleanController())
.build())
.build())
// Visitor Helper
.group(OptionGroup.createBuilder()
.name(Component.translatable("skyblocker.config.farming.visitorHelper"))
.collapsed(false)
.collapsed(true)
.option(Option.<Boolean>createBuilder()
.name(Component.translatable("skyblocker.config.farming.visitorHelper.visitorHelper"))
.description(Component.translatable("skyblocker.config.farming.visitorHelper.visitorHelper.@Tooltip"))
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/de/hysky/skyblocker/config/configs/FarmingConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ public class FarmingConfig {
public static class Garden {
public FarmingHud farmingHud = new FarmingHud();

public boolean dicerTitlePrevent = true;
@Deprecated
public transient boolean dicerTitlePrevent;

public boolean pestHighlighter = true;

Expand Down Expand Up @@ -52,7 +53,7 @@ public enum Type {

@Override
public String toString() {
return I18n.get("skyblocker.config.farming.garden.farmingHud.type." + name());
return I18n.get("skyblocker.config.farming.farmingHud.type." + name());
}
}
}
11 changes: 0 additions & 11 deletions src/main/java/de/hysky/skyblocker/mixins/GuiMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import net.minecraft.core.component.DataComponents;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.Tag;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.Identifier;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
Expand All @@ -37,15 +36,12 @@

import java.util.OptionalInt;
import java.util.function.Supplier;
import java.util.regex.Pattern;

@Environment(EnvType.CLIENT)
@Mixin(Gui.class)
public abstract class GuiMixin {
@Unique
private static final Supplier<Identifier> SLOT_LOCK_ICON = () -> SkyblockerConfigManager.get().general.itemProtection.slotLockStyle.tex;
@Unique
private static final Pattern DICER_TITLE_BLACKLIST = Pattern.compile(".+? DROP!");

@Shadow
@Final
Expand Down Expand Up @@ -130,11 +126,4 @@ private static boolean isQuiverItem(ItemStack stack) {

return cooldownProgress;
}

@Inject(method = "setTitle", at = @At("HEAD"), cancellable = true)
private void skyblocker$dicerTitlePrevent(Component title, CallbackInfo ci) {
if (Utils.isOnSkyblock() && SkyblockerConfigManager.get().farming.garden.dicerTitlePrevent && title != null && DICER_TITLE_BLACKLIST.matcher(title.getString()).matches()) {
ci.cancel();
}
}
}
28 changes: 14 additions & 14 deletions src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHudWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,18 +105,18 @@ public void updateContent() {
if (FarmingHud.CounterType.NONE.matchesText(counterText)) counterNumber = "";
addSimpleIcoText(cropStack, counterText, ChatFormatting.YELLOW, counterNumber);
float cropsPerMinute = FarmingHud.cropsPerMinute();
addSimpleIconTranslatableText(cropStack, "skyblocker.config.farming.general.cropsPerMin", ChatFormatting.YELLOW, FarmingHud.NUMBER_FORMAT.format((int) cropsPerMinute / 10 * 10));
addSimpleIconTranslatableText(Ico.GOLD, "skyblocker.config.farming.general.coinsPerHour", ChatFormatting.GOLD, getPriceText(cropItemId, cropsPerMinute));
addSimpleIconTranslatableText(cropStack, "skyblocker.config.farming.general.blocksPerSec", ChatFormatting.YELLOW, Double.toString(FarmingHud.blockBreaks()));
addSimpleIconTranslatableText(cropStack, "skyblocker.farming.farmingHud.cropsPerMin", ChatFormatting.YELLOW, FarmingHud.NUMBER_FORMAT.format((int) cropsPerMinute / 10 * 10));
addSimpleIconTranslatableText(Ico.GOLD, "skyblocker.farming.farmingHud.coinsPerHour", ChatFormatting.GOLD, getPriceText(cropItemId, cropsPerMinute));
addSimpleIconTranslatableText(cropStack, "skyblocker.farming.farmingHud.blocksPerSec", ChatFormatting.YELLOW, Double.toString(FarmingHud.blockBreaks()));
//noinspection DataFlowIssue
addComponent(Elements.progressComponent(Ico.LANTERN, Component.translatable("skyblocker.config.farming.general.farmingLevel"), FarmingHud.farmingXpPercentProgress(), ChatFormatting.GOLD.getColor()));
addSimpleIconTranslatableText(Ico.LIME_DYE, "skyblocker.config.farming.general.farmingXPPerHour", ChatFormatting.YELLOW, FarmingHud.NUMBER_FORMAT.format(FarmingHud.farmingXpPerHour()));
addComponent(Elements.progressComponent(Ico.LANTERN, Component.translatable("skyblocker.farming.farmingHud.farmingLevel"), FarmingHud.farmingXpPercentProgress(), ChatFormatting.GOLD.getColor()));
addSimpleIconTranslatableText(Ico.LIME_DYE, "skyblocker.farming.farmingHud.farmingXPPerHour", ChatFormatting.YELLOW, FarmingHud.NUMBER_FORMAT.format(FarmingHud.farmingXpPerHour()));

Entity cameraEntity = client.getCameraEntity();
Component yaw = cameraEntity == null ? Component.translatable("skyblocker.config.farming.general.noCameraEntity") : Component.literal(String.format("%.2f", Mth.wrapDegrees(cameraEntity.getYRot())));
Component pitch = cameraEntity == null ? Component.translatable("skyblocker.config.farming.general.noCameraEntity") : Component.literal(String.format("%.2f", Mth.wrapDegrees(cameraEntity.getXRot())));
addComponent(new PlainTextElement(Component.translatable("skyblocker.config.farming.general.yaw", yaw).withStyle(ChatFormatting.GOLD)));
addComponent(new PlainTextElement(Component.translatable("skyblocker.config.farming.general.pitch", pitch).withStyle(ChatFormatting.GOLD)));
Component yaw = cameraEntity == null ? Component.translatable("skyblocker.farming.farmingHud.noCameraEntity") : Component.literal(String.format("%.2f", Mth.wrapDegrees(cameraEntity.getYRot())));
Component pitch = cameraEntity == null ? Component.translatable("skyblocker.farming.farmingHud.noCameraEntity") : Component.literal(String.format("%.2f", Mth.wrapDegrees(cameraEntity.getXRot())));
addComponent(new PlainTextElement(Component.translatable("skyblocker.farming.farmingHud.yaw", yaw).withStyle(ChatFormatting.GOLD)));
addComponent(new PlainTextElement(Component.translatable("skyblocker.farming.farmingHud.pitch", pitch).withStyle(ChatFormatting.GOLD)));
if (LowerSensitivity.isSensitivityLowered()) {
addComponent(new PlainTextElement(Component.translatable("skyblocker.garden.hud.mouseLocked").withStyle(ChatFormatting.ITALIC)));
}
Expand Down Expand Up @@ -146,37 +146,37 @@ private Component getPriceText(String cropItemId, float cropsPerMinute) {
// Use NPC price if it's available.
if (itemNpcPrice > 0 && itemNpcPrice != Double.MIN_VALUE) {
priceToUse = itemNpcPrice;
sourceLabel = Component.literal(" (").append(Component.translatable("skyblocker.config.farming.garden.farmingHud.type.NPC")).append(")");
sourceLabel = Component.literal(" (").append(Component.translatable("skyblocker.config.farming.farmingHud.type.NPC")).append(")");
hasValidPrice = true;
}
}
case BAZAAR -> {
// Use Bazaar price if data is available.
if (hasBazaarData) {
priceToUse = bazaarPrice;
sourceLabel = Component.literal(" (").append(Component.translatable("skyblocker.config.farming.garden.farmingHud.type.BAZAAR")).append(")");
sourceLabel = Component.literal(" (").append(Component.translatable("skyblocker.config.farming.farmingHud.type.BAZAAR")).append(")");
hasValidPrice = true;
}
}
case BOTH -> {
// Use the NPC price if it's higher than the Bazaar price and available.
if (itemNpcPrice > bazaarPrice && itemNpcPrice != Double.MIN_VALUE) {
priceToUse = itemNpcPrice;
sourceLabel = Component.literal(" (").append(Component.translatable("skyblocker.config.farming.garden.farmingHud.type.NPC")).append(")");
sourceLabel = Component.literal(" (").append(Component.translatable("skyblocker.config.farming.farmingHud.type.NPC")).append(")");
hasValidPrice = true;
}
// Otherwise, use Bazaar price if available.
else if (hasBazaarData) {
priceToUse = bazaarPrice;
sourceLabel = Component.literal(" (").append(Component.translatable("skyblocker.config.farming.garden.farmingHud.type.BAZAAR")).append(")");
sourceLabel = Component.literal(" (").append(Component.translatable("skyblocker.config.farming.farmingHud.type.BAZAAR")).append(")");
hasValidPrice = true;
}
}
}


// Multiply by 60 to convert to hourly and divide by 100 for rounding is combined into multiplying by 0.6.
return hasValidPrice ? Component.literal(FarmingHud.NUMBER_FORMAT.format((int) (priceToUse * cropsPerMinute * 0.6) * 100)).append(sourceLabel) : Component.translatable("skyblocker.config.farming.general.noData");
return hasValidPrice ? Component.literal(FarmingHud.NUMBER_FORMAT.format((int) (priceToUse * cropsPerMinute * 0.6) * 100)).append(sourceLabel) : Component.translatable("skyblocker.farming.farmingHud.noData");
}

@Override
Expand Down
Loading