Merge pull request #18 from Tangos-Mods/v4

Implementing ScamScreener to Wizard and Fixed persistence of background image

Author: KdGaming0

build.gradle.kts

@@ -33,6 +33,7 @@ dependencies {
     modImplementation("com.daqem.uilib:uilib-fabric:${property("deps.uilib_version")}")
 
     modImplementation("maven.modrinth:modmenu:${property("deps.modmenu_version")}")
+    modCompileOnly("maven.modrinth:scamscreener:${property("deps.scamscreener_version")}")
 
     modImplementation("net.azureaaron:hm-api:${property("deps.hm_api_version")}")
     include("net.azureaaron:hm-api:${property("deps.hm_api_version")}")
@@ -42,6 +43,8 @@ dependencies {
 
     modRuntimeOnly("me.djtheredstoner:DevAuth-fabric:1.2.2")
     modRuntimeOnly("maven.modrinth:modmenu:${property("deps.modmenu_version")}")
+
+    modRuntimeOnly("maven.modrinth:scamscreener:${property("deps.scamscreener_version")}")
 }
 
 loom {
@@ -141,6 +144,9 @@ publishMods {
         optional {
             slug = "mOgUt4GM" // ModMenu
         }
+        optional {
+            slug = "scamscreener"
+        }
     }
 
     curseforge {
@@ -157,4 +163,4 @@ publishMods {
             slug = "modmenu"
         }
     }
-}
+}

gradle.properties

@@ -19,9 +19,10 @@ deps.moulconfig_version=[VERSIONED]
 deps.midnightlib_version=[VERSIONED]
 deps.hm_api_version=[VERSIONED]
 deps.modmenu_version=[VERSIONED]
+deps.scamscreener_version=[VERSIONED]
 
 deps.sodium_version=[VERSIONED]
 deps.iris_version=[VERSIONED]
 
 publish.modrinth=V3FnL7QV
-publish.curseforge=1375477
+publish.curseforge=1375477

src/main/java/com/github/kd_gaming1/packcore/gui/component/MarkdownComponent.java

@@ -83,7 +83,7 @@ public MarkdownComponent(int x, int y, int maxWidth, String markdown) {
 
     public MarkdownComponent(int x, int y, int maxWidth, String markdown, int defaultColor) {
         super(x, y, maxWidth, 0);
-        this.markdown = markdown;
+        this.markdown = markdown != null ? markdown : "";
         this.maxWidth = maxWidth;
         this.defaultColor = defaultColor;
         rebuild();
@@ -597,4 +597,4 @@ private int getHeadingColor(int level) {
             default -> defaultColor;
         };
     }
-}
+}

src/main/java/com/github/kd_gaming1/packcore/gui/screen/SBETitleScreen.java

@@ -139,11 +139,12 @@ protected void init() {
         int overlayX = (this.width - overlayW) / 2;
         int overlayY = (this.height - overlayH) / 2 + 25;
 
-        String changelogMarkdown = updateStatus.changelog();
+        String changelogVersion = resolveChangelogVersion(updateStatus);
+        String changelogMarkdown = resolveChangelogMarkdown(updateStatus);
 
         changelogOverlay = new OverlayComponent(
                 overlayX, overlayY, overlayW, overlayH,
-                Component.translatable("gui.packcore.overlay.changelog.title", updateStatus.latestVersion()),
+                Component.translatable("gui.packcore.overlay.changelog.title", changelogVersion),
                 changelogMarkdown
         );
         changelogOverlay.setOnClose(() -> setMenuButtonsVisible(true));
@@ -358,6 +359,26 @@ private static Component buildVersionText(UpdateStatus status) {
         return Component.literal("v" + installed);
     }
 
+    private static String resolveChangelogVersion(UpdateStatus status) {
+        if (status.latestVersion() != null && !status.latestVersion().isBlank()) {
+            return status.latestVersion();
+        }
+        if (status.installedVersion() != null && !status.installedVersion().isBlank()) {
+            return status.installedVersion();
+        }
+        return ModpackMetadata.getInstance().getModpackVersion();
+    }
+
+    private static String resolveChangelogMarkdown(UpdateStatus status) {
+        if (status.changelog() != null && !status.changelog().isBlank()) {
+            return status.changelog();
+        }
+
+        return Component.translatable("gui.packcore.overlay.changelog.empty").getString()
+                + "\n\n"
+                + Component.translatable("gui.packcore.overlay.changelog.empty.hint").getString();
+    }
+
     private void setMenuButtonsVisible(boolean visible) {
         joinHypixelButton.visible = visible;
         joinHypixelButton.active = visible;
@@ -399,4 +420,4 @@ public boolean keyPressed(KeyEvent keyEvent) {
         }
         return super.keyPressed(keyEvent);
     }
-}
+}

src/main/java/com/github/kd_gaming1/packcore/gui/screen/WelcomeWizardScreen.java

@@ -8,6 +8,7 @@
 import com.github.kd_gaming1.packcore.metadata.ModpackMetadata;
 import eu.midnightdust.lib.config.MidnightConfig;
 import com.github.kd_gaming1.packcore.gui.wizard.page.ConfirmApplyPage;
+import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.Component;
@@ -63,6 +64,9 @@ private void registerPages() {
         navigator.addPage(new TabDesignPage(wizardState, navigator, contentWidth, contentHeight));
         navigator.addPage(new ItemBackgroundPage(wizardState, navigator, contentWidth, contentHeight));
         navigator.addPage(new StorageDesignPage(wizardState, navigator, contentWidth, contentHeight));
+        if (FabricLoader.getInstance().isModLoaded("scamscreener")) {
+            navigator.addPage(new ScamScreenerPage(wizardState, navigator, contentWidth, contentHeight));
+        }
         navigator.addPage(new ResourcePackPage(wizardState, navigator, contentWidth, contentHeight));
 
         confirmApplyPage = new ConfirmApplyPage(wizardState, navigator, contentWidth, contentHeight);
@@ -109,7 +113,7 @@ private void wireEvents() {
         // Finish — settings have been applied; mark complete and close
         buttonBar.setOnFinish(() -> {
             markWizardComplete();
-            Minecraft.getInstance().setScreen(lastScreen);
+            Minecraft.getInstance().setScreen(resolvePostWizardScreen());
         });
 
         // Skip on the last page — close without applying; still marks complete
@@ -130,6 +134,14 @@ private void markWizardComplete() {
         MidnightConfig.write(MOD_ID);
     }
 
+    private Screen resolvePostWizardScreen() {
+        return switch (PackCoreConfig.menuStyle) {
+            case MODERN -> new SBETitleScreen();
+            case MODERN_MINIMAL -> new SBETitleScreen(false);
+            case MINIMAL -> new PackCoreTitleScreen();
+        };
+    }
+
     @Override
     public boolean shouldCloseOnEsc() {
         if (navigator.hasPrevious()) {
@@ -143,4 +155,4 @@ public boolean shouldCloseOnEsc() {
     public void onClose() {
         Minecraft.getInstance().setScreen(lastScreen);
     }
-}
+}

src/main/java/com/github/kd_gaming1/packcore/gui/wizard/WizardButtonBar.java

@@ -4,6 +4,7 @@
 import com.daqem.uilib.gui.widget.ButtonWidget;
 import com.daqem.uilib.gui.widget.CustomButtonWidget;
 import com.github.kd_gaming1.packcore.gui.util.GuiHelper;
+import com.github.kd_gaming1.packcore.gui.wizard.page.ScamScreenerPage;
 import com.github.kd_gaming1.packcore.metadata.ModpackMetadata;
 import net.minecraft.client.gui.components.Tooltip;
 import net.minecraft.client.gui.components.WidgetSprites;
@@ -32,6 +33,11 @@ public class WizardButtonBar extends EmptyComponent {
             Identifier.fromNamespaceAndPath(MOD_ID, "menu/buttons/disabled_continue_gray_button"),
             Identifier.fromNamespaceAndPath(MOD_ID, "menu/buttons/hover_continue_gray_button")
     );
+    private static final WidgetSprites SCAM_SCREENER_CONTINUE_BUTTON = new WidgetSprites(
+            Identifier.fromNamespaceAndPath(MOD_ID, "menu/buttons/continue_gray_button"),
+            Identifier.fromNamespaceAndPath(MOD_ID, "menu/buttons/continue_gray_button"),
+            Identifier.fromNamespaceAndPath(MOD_ID, "menu/buttons/hover_continue_gray_button")
+    );
 
     private static final WidgetSprites PREVIOUS_BUTTON = new WidgetSprites(
             Identifier.fromNamespaceAndPath(MOD_ID, "menu/buttons/previous_gray_button"),
@@ -64,6 +70,7 @@ public class WizardButtonBar extends EmptyComponent {
     private final ButtonWidget backButton;
     private final ButtonWidget skipButton;
     private final ButtonWidget continueButton;
+    private final ButtonWidget scamScreenerContinueButton;
     private final ButtonWidget finishButton;
 
     public WizardButtonBar(WizardNavigator navigator, int width, int height) {
@@ -99,6 +106,12 @@ public WizardButtonBar(WizardNavigator navigator, int width, int height) {
                 CONTINUE_BUTTON,
                 btn -> navigator.nextPage()
         );
+        scamScreenerContinueButton = new CustomButtonWidget(
+                width - BTN_WIDTH - BTN_GAP, btnY, BTN_WIDTH, BTN_HEIGHT,
+                Component.translatable("gui.packcore.wizard.button.continue"),
+                SCAM_SCREENER_CONTINUE_BUTTON,
+                btn -> navigator.nextPage()
+        );
 
         backButton = new CustomButtonWidget(
                 width - BTN_WIDTH * 2 - BTN_GAP * 2, btnY, BTN_WIDTH, BTN_HEIGHT,
@@ -132,6 +145,7 @@ public WizardButtonBar(WizardNavigator navigator, int width, int height) {
         this.addWidget(skipButton);
         this.addWidget(backButton);
         this.addWidget(continueButton);
+        this.addWidget(scamScreenerContinueButton);
         this.addWidget(finishButton);
 
         refresh();
@@ -141,12 +155,16 @@ public WizardButtonBar(WizardNavigator navigator, int width, int height) {
     public void refresh() {
         boolean hasBack = navigator.hasPrevious();
         boolean isLastPage = navigator.isOnLastPage();
+        boolean isScamScreenerPage = navigator.getCurrentPage() instanceof ScamScreenerPage;
 
         backButton.visible = hasBack;
         backButton.active = hasBack;
 
-        continueButton.visible = !isLastPage;
-        continueButton.active = !isLastPage;
+        continueButton.visible = !isLastPage && !isScamScreenerPage;
+        continueButton.active = !isLastPage && !isScamScreenerPage;
+
+        scamScreenerContinueButton.visible = !isLastPage && isScamScreenerPage;
+        scamScreenerContinueButton.active = !isLastPage && isScamScreenerPage;
 
         skipButton.visible = isLastPage;
         skipButton.active = isLastPage;
@@ -192,4 +210,4 @@ private static void openUrlSafely(String url) {
             LOGGER.warn("Couldn't open uri '{}' ", url, e);
         }
     }
-}
+}

src/main/java/com/github/kd_gaming1/packcore/gui/wizard/WizardState.java

@@ -1,10 +1,16 @@
 package com.github.kd_gaming1.packcore.gui.wizard;
 
-import java.util.*;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
 
 public class WizardState {
 
     private final Map<String, String> selections = new HashMap<>();
+    private final Map<String, Set<String>> multiSelections = new HashMap<>();
     private final Set<String> selectedResourcePacks = new HashSet<>();
 
     // Selections
@@ -16,6 +22,25 @@ public String getSelection(String key) {
         return selections.get(key);
     }
 
+    // Generic multi-select state
+    public Set<String> getMultiSelection(String key) {
+        return Collections.unmodifiableSet(multiSelections.getOrDefault(key, Set.of()));
+    }
+
+    public void addMultiSelection(String key, String value) {
+        multiSelections.computeIfAbsent(key, ignored -> new LinkedHashSet<>()).add(value);
+    }
+
+    public void removeMultiSelection(String key, String value) {
+        Set<String> values = multiSelections.get(key);
+        if (values == null) return;
+
+        values.remove(value);
+        if (values.isEmpty()) {
+            multiSelections.remove(key);
+        }
+    }
+
     // Resource Packs
     public Set<String> getSelectedResourcePacks() {
         return Collections.unmodifiableSet(selectedResourcePacks);
@@ -33,7 +58,8 @@ public void removeResourcePack(String packId) {
     public String toString() {
         return "WizardState{" +
                 "selections=" + selections +
+                ", multiSelections=" + multiSelections +
                 ", resourcePacks=" + selectedResourcePacks +
                 '}';
     }
-}
+}