diff options
| -rw-r--r-- | gradle.properties | 2 | ||||
| -rw-r--r-- | src/main/java/cc/polyfrost/oneconfig/gui/SideBar.java | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/gradle.properties b/gradle.properties index bce68dd..89e6dff 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ mod_name = OneConfig mod_id = oneconfig -mod_version = 0.1.0-alpha27 +mod_version = 0.1.0-alpha28 essential.defaults.loom=0 diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/SideBar.java b/src/main/java/cc/polyfrost/oneconfig/gui/SideBar.java index fd8d3d6..f6ce543 100644 --- a/src/main/java/cc/polyfrost/oneconfig/gui/SideBar.java +++ b/src/main/java/cc/polyfrost/oneconfig/gui/SideBar.java @@ -34,10 +34,10 @@ public class SideBar { }}; private final BasicButton HUDButton = new BasicButton(192, SIZE_36, "Edit HUD", SVGs.NOTE_PENCIL_BOLD, null, ALIGNMENT_LEFT, ColorPalette.SECONDARY); private final BasicButton CloseButton = new BasicButton(192, SIZE_36, "Close", SVGs.X_CIRCLE_BOLD, null, ALIGNMENT_LEFT, ColorPalette.SECONDARY_DESTRUCTIVE); - private int selected = 2; private Animation moveAnimation = null; private Animation sizeAnimation = null; + private int y; public SideBar() { buttons.get(0).setClickAction(new CreditsPage()); @@ -52,13 +52,14 @@ public class SideBar { } public void draw(long vg, int x, int y) { + this.y = y; for (BasicButton button : buttons) { if (!button.isClicked()) continue; moveSideBar(button); break; } if (moveAnimation != null) { - RenderManager.drawRoundedRect(vg, x + 16, moveAnimation.get() - (sizeAnimation.get() - 36) / 2f, 192, sizeAnimation.get(0), Colors.PRIMARY_600, 12); + RenderManager.drawRoundedRect(vg, x + 16, y + moveAnimation.get() - (sizeAnimation.get() - 36) / 2f, 192, sizeAnimation.get(0), Colors.PRIMARY_600, 12); if (moveAnimation.isFinished() && sizeAnimation.isFinished()) { moveAnimation = null; sizeAnimation = null; @@ -92,7 +93,7 @@ public class SideBar { private void moveSideBar(BasicButton button) { if (button.equals(buttons.get(selected))) return; buttons.get(selected).setColorPalette(ColorPalette.TERTIARY); - moveAnimation = new EaseInOutQuart(300, buttons.get(selected).y, button.y, false); + moveAnimation = new EaseInOutQuart(300, buttons.get(selected).y - y, button.y - y, false); sizeAnimation = new DummyAnimation(36); selected = buttons.indexOf(button); } |