diff options
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java | 23 | ||||
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/skyblock/fancybars/FancyStatusBars.java | 17 |
2 files changed, 25 insertions, 15 deletions
diff --git a/src/main/java/de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java b/src/main/java/de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java index e02f86d7..f18edf9a 100644 --- a/src/main/java/de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java @@ -160,31 +160,38 @@ public class UIAndVisualsConfig { public boolean enableBars = true; // Kept in for backwards compatibility, remove if needed + @SuppressWarnings("DeprecatedIsStillUsed") + @Deprecated @SerialEntry - public OldBarPositions barPositions = new OldBarPositions(); + public LegacyBarPositions barPositions = new LegacyBarPositions(); } /** - * Backwards compat + * Backwards compat. + * <p> + * Used to load the legacy bar positions, which will not have an effect once the bars are saved in the new format at {@code /skyblocker/status_bars.json}. + * New bars do not need to be added here. */ - public static class OldBarPositions { + @SuppressWarnings("DeprecatedIsStillUsed") + @Deprecated + public static class LegacyBarPositions { @SerialEntry - public OldBarPosition healthBarPosition = OldBarPosition.LAYER1; + public LegacyBarPosition healthBarPosition = LegacyBarPosition.LAYER1; @SerialEntry - public OldBarPosition manaBarPosition = OldBarPosition.LAYER1; + public LegacyBarPosition manaBarPosition = LegacyBarPosition.LAYER1; @SerialEntry - public OldBarPosition defenceBarPosition = OldBarPosition.LAYER1; + public LegacyBarPosition defenceBarPosition = LegacyBarPosition.LAYER1; @SerialEntry - public OldBarPosition experienceBarPosition = OldBarPosition.LAYER1; + public LegacyBarPosition experienceBarPosition = LegacyBarPosition.LAYER1; } /** * Backwards compat */ - public enum OldBarPosition { + public enum LegacyBarPosition { LAYER1, LAYER2, RIGHT, NONE } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/fancybars/FancyStatusBars.java b/src/main/java/de/hysky/skyblocker/skyblock/fancybars/FancyStatusBars.java index c3bba3a6..081059ce 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/fancybars/FancyStatusBars.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/fancybars/FancyStatusBars.java @@ -71,14 +71,17 @@ public class FancyStatusBars { // Fetch from old status bar config int[] counts = new int[3]; // counts for RIGHT, LAYER1, LAYER2 StatusBar health = statusBars.get("health"); - UIAndVisualsConfig.OldBarPositions barPositions = SkyblockerConfigManager.get().uiAndVisuals.bars.barPositions; - loadOldBarPosition(health, counts, barPositions.healthBarPosition); + @SuppressWarnings("deprecation") + UIAndVisualsConfig.LegacyBarPositions barPositions = SkyblockerConfigManager.get().uiAndVisuals.bars.barPositions; + initBarPosition(health, counts, barPositions.healthBarPosition); StatusBar intelligence = statusBars.get("intelligence"); - loadOldBarPosition(intelligence, counts, barPositions.manaBarPosition); + initBarPosition(intelligence, counts, barPositions.manaBarPosition); StatusBar defense = statusBars.get("defense"); - loadOldBarPosition(defense, counts, barPositions.defenceBarPosition); + initBarPosition(defense, counts, barPositions.defenceBarPosition); StatusBar experience = statusBars.get("experience"); - loadOldBarPosition(experience, counts, barPositions.experienceBarPosition); + initBarPosition(experience, counts, barPositions.experienceBarPosition); + StatusBar speed = statusBars.get("speed"); + initBarPosition(speed, counts, UIAndVisualsConfig.LegacyBarPosition.LAYER1); CompletableFuture.supplyAsync(FancyStatusBars::loadBarConfig).thenAccept(object -> { if (object != null) { @@ -111,12 +114,12 @@ public class FancyStatusBars { } /** - * Loads the bar position from the old config + * Loads the bar position from the old config. Should be used to initialize new bars too. * @param bar the bar to load the position for * @param counts the counts for each bar position (LAYER1, LAYER2, RIGHT) * @param position the position to load */ - private static void loadOldBarPosition(StatusBar bar, int[] counts, UIAndVisualsConfig.OldBarPosition position) { + private static void initBarPosition(StatusBar bar, int[] counts, UIAndVisualsConfig.LegacyBarPosition position) { switch (position) { case RIGHT: bar.anchor = BarPositioner.BarAnchor.HOTBAR_RIGHT; |
