-
-
Notifications
You must be signed in to change notification settings - Fork 186
Better hud #2377
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.
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
base: main
Are you sure you want to change the base?
Better hud #2377
Changes from 23 commits
5094150
0c33572
3b3d6b6
56651b5
198818e
51cb199
c266556
c38768e
bbe6bd5
7c6f8c7
94a8c47
2e98556
3f77ba4
6a26d6b
415a6f9
ff8c2fa
5208b45
1bb6192
661bf3f
0a5b041
e4b6e68
eaab554
3372af7
e4a445a
7374ef8
7495a88
c3966eb
099a1db
7c4fa7c
fab64ec
822faad
8fe2ed9
798228b
59920e5
dacd017
12742d6
16d280e
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,17 +6,16 @@ | |
| import de.hysky.skyblocker.config.SkyblockerConfig; | ||
| import de.hysky.skyblocker.config.configs.UIAndVisualsConfig; | ||
| import de.hysky.skyblocker.skyblock.GyroOverlay; | ||
| import de.hysky.skyblocker.skyblock.ItemPickupWidget; | ||
| import de.hysky.skyblocker.skyblock.fancybars.StatusBarsConfigScreen; | ||
| import de.hysky.skyblocker.skyblock.item.slottext.SlotTextManager; | ||
| import de.hysky.skyblocker.skyblock.item.slottext.SlotTextMode; | ||
| import de.hysky.skyblocker.skyblock.radialMenu.RadialMenu; | ||
| import de.hysky.skyblocker.skyblock.radialMenu.RadialMenuManager; | ||
| import de.hysky.skyblocker.skyblock.tabhud.config.WidgetsConfigurationScreen; | ||
| import de.hysky.skyblocker.skyblock.tabhud.screenbuilder.ScreenBuilder; | ||
| import de.hysky.skyblocker.skyblock.tabhud.screenbuilder.LayerConfig; | ||
| import de.hysky.skyblocker.skyblock.tabhud.screenbuilder.WidgetManager; | ||
| import de.hysky.skyblocker.skyblock.teleport.TeleportOverlay; | ||
| import de.hysky.skyblocker.skyblock.waypoint.WaypointsScreen; | ||
| import de.hysky.skyblocker.utils.Location; | ||
| import de.hysky.skyblocker.utils.container.SlotTextAdder; | ||
| import de.hysky.skyblocker.utils.render.title.TitleContainerConfigScreen; | ||
| import de.hysky.skyblocker.utils.waypoint.Waypoint; | ||
|
|
@@ -33,6 +32,7 @@ | |
| import net.minecraft.client.Minecraft; | ||
| import net.minecraft.client.input.InputQuirks; | ||
| import net.minecraft.network.chat.Component; | ||
| import org.apache.commons.lang3.ArrayUtils; | ||
|
|
||
| import java.awt.Color; | ||
| import java.util.Comparator; | ||
|
|
@@ -296,18 +296,27 @@ public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig | |
| .name(Component.translatable("skyblocker.config.uiAndVisuals.tabHud")) | ||
| .collapsed(true) | ||
| .option(Option.<Boolean>createBuilder() | ||
| .name(Component.translatable("skyblocker.config.uiAndVisuals.tabHud.tabHudEnabled")) | ||
| .binding(defaults.uiAndVisuals.tabHud.tabHudEnabled, | ||
| () -> config.uiAndVisuals.tabHud.tabHudEnabled, | ||
| newValue -> config.uiAndVisuals.tabHud.tabHudEnabled = newValue) | ||
| .name(Component.translatable("skyblocker.config.uiAndVisuals.tabHud.fancyWidgetsList")) | ||
| .description(Component.translatable("skyblocker.config.uiAndVisuals.tabHud.fancyWidgetsList.@Tooltip")) | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I don't think this text is correct?
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. it is, in fact, incorrect. Copy paste oopsie |
||
| .binding(defaults.uiAndVisuals.tabHud.enableFancyTab, | ||
| () -> config.uiAndVisuals.tabHud.enableFancyTab, | ||
| newValue -> config.uiAndVisuals.tabHud.enableFancyTab = newValue) | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If this does the same as
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It does not, |
||
| .controller(ConfigUtils.createBooleanController()) | ||
| .build()) | ||
| .option(Option.<Boolean>createBuilder() | ||
| .name(Component.translatable("skyblocker.config.uiAndVisuals.tabHud.fancyWidgetsList")) | ||
| .description(Component.translatable("skyblocker.config.uiAndVisuals.tabHud.fancyWidgetsList.@Tooltip")) | ||
| .binding(defaults.uiAndVisuals.tabHud.enableFancyWidgetsList, | ||
| () -> config.uiAndVisuals.tabHud.enableFancyWidgetsList, | ||
| newValue -> config.uiAndVisuals.tabHud.enableFancyWidgetsList = newValue) | ||
| .controller(ConfigUtils.createBooleanController()) | ||
| .build()) | ||
| .option(ButtonOption.createBuilder() | ||
| .name(Component.translatable("skyblocker.config.uiAndVisuals.tabHud.configScreen")) | ||
| .description(Component.translatable("skyblocker.config.uiAndVisuals.tabHud.configScreen.@Tooltip")) | ||
| .tags(Component.literal("gui")) | ||
| .tags(ArrayUtils.add(WidgetManager.WIDGET_INSTANCES.values().stream().map(w -> w.getInformation().displayName()).toArray(Component[]::new), Component.literal("gui"))) | ||
| .prompt(Component.translatable("text.skyblocker.open")) | ||
| .action(WidgetsConfigurationScreen::openWidgetsConfigScreen) | ||
| .action(_ -> new WidgetsConfigurationScreen()) | ||
| .build()) | ||
| .option(Option.<Integer>createBuilder() | ||
| .name(Component.translatable("skyblocker.config.uiAndVisuals.tabHud.tabHudScale")) | ||
|
|
@@ -367,7 +376,7 @@ public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig | |
| () -> config.uiAndVisuals.tabHud.effectsFromFooter, | ||
| newValue -> config.uiAndVisuals.tabHud.effectsFromFooter = newValue) | ||
| .build()) | ||
| .option(Option.<ScreenBuilder.DefaultPositioner>createBuilder() | ||
| .option(Option.<LayerConfig.Positioner>createBuilder() | ||
| .name(Component.translatable("skyblocker.config.uiAndVisuals.tabHud.defaultPositioning")) | ||
| .binding(defaults.uiAndVisuals.tabHud.defaultPositioning, | ||
| () -> config.uiAndVisuals.tabHud.defaultPositioning, | ||
|
|
@@ -983,11 +992,6 @@ public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig | |
| .group(OptionGroup.createBuilder() | ||
| .name(Component.translatable("skyblocker.config.uiAndVisuals.itemPickup")) | ||
| .collapsed(true) | ||
| .option(ButtonOption.createBuilder() | ||
| .name(Component.translatable("skyblocker.config.uiAndVisuals.itemPickup.hud.screen")) | ||
| .prompt(Component.translatable("text.skyblocker.open")) | ||
| .action(screen -> Minecraft.getInstance().setScreen(new WidgetsConfigurationScreen(Location.HUB, ItemPickupWidget.getInstance().getInternalID(), screen))) | ||
| .build()) | ||
| .option(Option.<Boolean>createBuilder() | ||
| .name(Component.translatable("skyblocker.config.uiAndVisuals.itemPickup.sackNotifications")) | ||
| .description(Component.translatable("skyblocker.config.uiAndVisuals.itemPickup.sackNotifications.@Tooltip")) | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think you should add back these buttons across all the categories.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I plan on removing the "enable x hud" toggles across all configs as they literally do nothing right now ✨
And I also plan to move the widget configs from there to the per widget thing in the new system to have them in the side panel (stuff like farming hud and end hud options)
didn't get around to doing it to hopefully avoid merge conflicts a smidge, in case those configs get touched in the time this gets reviewed. Removed these buttons so it would compile