From 08ca03a65e5e2fe00a56f0bf4aa2b7c2530888cd Mon Sep 17 00:00:00 2001 From: Linnea Gräf Date: Fri, 1 Aug 2025 16:12:21 +0200 Subject: fix nav buttons --- .../profileviewer/rework/ProfileViewerScreenRework.java | 15 ++++++++------- .../skyblock/profileviewer/rework/pages/SkillsPage.java | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) (limited to 'src/main/java/de') diff --git a/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/rework/ProfileViewerScreenRework.java b/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/rework/ProfileViewerScreenRework.java index c2507eb1..c3b265c9 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/rework/ProfileViewerScreenRework.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/rework/ProfileViewerScreenRework.java @@ -65,13 +65,14 @@ public class ProfileViewerScreenRework extends Screen { this.currentLoadState = profileLoadState; this.pages = switch (profileLoadState) { case ProfileLoadState.Error error -> List.of(new ErrorPage(error)); - case ProfileLoadState.SuccessfulLoad successfulLoad -> PAGE_CONSTRUCTORS.stream().sorted().map(it -> it.apply(successfulLoad)).toList(); + case ProfileLoadState.SuccessfulLoad successfulLoad -> PAGE_CONSTRUCTORS.stream().map(it -> it.apply(successfulLoad)).sorted().toList(); case ProfileLoadState.Loading ignored -> List.of(new LoadingPage()); }; this.buttons = new ArrayList<>(); for (int i = 0; i < pages.size(); i++) { var page = pages.get(i); - buttons.add(new ProfileViewerNavButton(ignored -> setSelectedPage(selectedIndex), page.getName(), page.getIcon(), i, false)); + var finalI = i; + buttons.add(new ProfileViewerNavButton(ignored -> setSelectedPage(finalI), page.getName(), page.getIcon(), i, false)); } setSelectedPage(0); } @@ -103,6 +104,11 @@ public class ProfileViewerScreenRework extends Screen { widget.setPositionFromRoot(rootX + 5, rootY + 7); addDrawableChild(widget); } + for (var button : buttons) { + addDrawableChild(button); + button.setX(rootX + button.getIndex() * 28 + 4); + button.setY(rootY - 28); + } } public CompletableFuture loadProfilesFromPlayer(String name) { @@ -159,11 +165,6 @@ public class ProfileViewerScreenRework extends Screen { int rootY = height / 2 - GUI_HEIGHT / 2 + 5; context.drawTexture(RenderPipelines.GUI_TEXTURED, TEXTURE, rootX, rootY, 0, 0, GUI_WIDTH, GUI_HEIGHT, GUI_WIDTH, GUI_HEIGHT); - for (var button : buttons) { - button.setX(rootX + button.getIndex() * 28 + 4); - button.setY(rootY - 28); - button.render(context, mouseX, mouseY, deltaTicks); - } super.render(context, mouseX, mouseY, deltaTicks); } } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/rework/pages/SkillsPage.java b/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/rework/pages/SkillsPage.java index 233c7cfd..b7de2ac0 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/rework/pages/SkillsPage.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/rework/pages/SkillsPage.java @@ -58,7 +58,7 @@ public class SkillsPage implements ProfileViewerPage { @Init public static void init() { -// ProfileViewerScreenRework.PAGE_CONSTRUCTORS.add(SkillsPage::new); + ProfileViewerScreenRework.PAGE_CONSTRUCTORS.add(SkillsPage::new); } @Override -- cgit