feat: enhance diagnostics and storage/tab design handling with instant application

Author: KdGaming0

CHANGELOG.md

@@ -16,4 +16,10 @@
 - Full diagnostics report logged on every startup (modpack info, config pack, settings, runtime, system)
 - Crash reports now include a **PackCore Diagnostics** section with the same data as the startup log
 - New `/packcore diagnose` command — shows a compact report in chat with a **click-to-copy** button for easy sharing when reporting issues
-- New `/packcore crashtest` command — triggers a test crash to verify the crash report enrichment is working
+- New `/packcore crashtest` command — triggers a test crash to verify the crash report enrichment is working
+
+### Storage Design
+- Replaced the world-join command approach for toggling the Firmament storage overlay with direct reflection — the setting is now applied instantly without requiring a world join
+
+### Tab Design
+- SkyHanni compact tab list toggle now applied instantly via reflection instead of a delayed chat command on world join

src/main/java/com/github/kd_gaming1/packcore/gui/wizard/page/ConfirmApplyPage.java

@@ -87,10 +87,10 @@ private enum RowStatus { SUCCESS, ERROR }
     private final List<SummaryRowComponent> muiRows = new ArrayList<>();
 
     private CustomButtonWidget applyButton;
-    private static String globalErrorMessage;
+    private String globalErrorMessage;
     private Runnable onApplySucceeded;
     private boolean applyCompleted;
-    private static String resourcePackWarningMessage;
+    private String resourcePackWarningMessage;
 
     public void setOnApplySucceeded(Runnable callback) { onApplySucceeded = callback; }
     public boolean isApplyCompleted() { return applyCompleted; }
@@ -138,29 +138,19 @@ public void onEnter() {
         // ── Warning area (restart + world-join, stacked if both needed) ──
         int buttonY = getHeight() - PADDING - BUTTON_HEIGHT;
         boolean showRestart = requiresRestart();
-        boolean showWorldJoin = requiresWorldJoin();
         int warningLineHeight = font.lineHeight + WARNING_LINE_GAP;
-        int warningCount = (showRestart ? 1 : 0) + (showWorldJoin ? 1 : 0);
-        int warningBlockHeight = warningCount > 0 ? warningCount * warningLineHeight + BUTTON_GAP : 0;
-        int firstWarningY = buttonY - warningBlockHeight;
+        int warningBlockHeight = showRestart ? warningLineHeight + BUTTON_GAP : 0;
+        int warningY = buttonY - warningBlockHeight;
 
-        int warningY = firstWarningY;
         if (showRestart) {
             addComponent(new MultiLineTextComponent(
                     PADDING, warningY, getWidth() - PADDING * 2 - SCROLL_BAR_WIDTH,
                     Component.translatable("gui.packcore.wizard.confirm.restart_required"),
                     GuiColors.WARNING));
-            warningY += warningLineHeight;
-        }
-        if (showWorldJoin) {
-            addComponent(new MultiLineTextComponent(
-                    PADDING, warningY, getWidth() - PADDING * 2 - SCROLL_BAR_WIDTH,
-                    Component.translatable("gui.packcore.wizard.confirm.world_join_required"),
-                    GuiColors.WARNING));
         }
 
         int scrollTop = PADDING + font.lineHeight + PADDING;
-        int scrollHeight = (warningCount > 0 ? firstWarningY - BUTTON_GAP : buttonY - BUTTON_GAP) - scrollTop;
+        int scrollHeight = (showRestart ? warningY - BUTTON_GAP : buttonY - BUTTON_GAP) - scrollTop;
 
         // ── Summary rows ──
         EmptyComponent rowContainer = new EmptyComponent(0, 0, rowWidth, 0);
@@ -458,13 +448,6 @@ private boolean requiresRestart() {
         return wantsCustomFont != engineCurrentlyOn;
     }
 
-    private boolean requiresWorldJoin() {
-        return (state.getSelection(TabDesignPage.STATE_KEY) != null
-                && FabricLoader.getInstance().isModLoaded("skyhanni"))
-                || (state.getSelection(StorageDesignPage.STATE_KEY) != null
-                && FabricLoader.getInstance().isModLoaded("firmament"));
-    }
-
     private boolean isHypixelPlusId(String packId) {
         return packId != null && packId.toLowerCase(Locale.ROOT).contains("hypixel");
     }
@@ -474,11 +457,22 @@ private boolean isHypixelPlusId(String packId) {
     @Override
     public void render(GuiGraphics graphics, int mouseX, int mouseY,
                        float partialTick, int parentWidth, int parentHeight) {
-        if (globalErrorMessage == null) return;
+        if (globalErrorMessage == null && resourcePackWarningMessage == null) return;
+
         var font = Minecraft.getInstance().font;
-        int errorY = getTotalY() + getHeight() - PADDING - BUTTON_HEIGHT + BUTTON_HEIGHT + 4;
-        graphics.drawCenteredString(font, globalErrorMessage,
-                getTotalX() + getWidth() / 2, errorY, GuiColors.ERROR);
+        int buttonY = getTotalY() + getHeight() - PADDING - BUTTON_HEIGHT;
+        int messageY = buttonY - font.lineHeight - 4;
+
+        if (globalErrorMessage != null) {
+            graphics.drawCenteredString(font, globalErrorMessage,
+                    getTotalX() + getWidth() / 2, messageY, GuiColors.ERROR);
+            messageY -= font.lineHeight + 4;
+        }
+
+        if (resourcePackWarningMessage != null) {
+            graphics.drawCenteredString(font, resourcePackWarningMessage,
+                    getTotalX() + getWidth() / 2, messageY, GuiColors.WARNING);
+        }
     }
 
     // ── SummaryRowComponent ───────────────────────────────────────────────────

src/main/java/com/github/kd_gaming1/packcore/integration/StorageDesignManager.java

@@ -1,23 +1,19 @@
 package com.github.kd_gaming1.packcore.integration;
 
 import com.github.kd_gaming1.packcore.PackCore;
-import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
 import net.fabricmc.loader.api.FabricLoader;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.player.LocalPlayer;
 
-import java.util.concurrent.atomic.AtomicReference;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 public class StorageDesignManager {
 
-    private static final AtomicReference<Boolean> pendingOverlayState = new AtomicReference<>(null);
-
-    static {
-        ClientPlayConnectionEvents.JOIN.register((handler, sender, client) -> {
-            Boolean state = pendingOverlayState.getAndSet(null);
-            if (state != null) scheduleCommand(state);
-        });
-    }
+    private static final String CONFIG_NAME = "storage-overlay";
+    private static final String OPTION_NAME = "always-replace";
 
     public enum StorageDesign {
         OVERLAY, VANILLA
@@ -28,37 +24,82 @@ public static boolean apply(StorageDesign design) {
             PackCore.LOGGER.warn("StorageDesign: Firmament not loaded, cannot apply");
             return false;
         }
+        try {
+            applyViaReflection(design == StorageDesign.OVERLAY);
+            PackCore.LOGGER.info("StorageDesign: applied {} immediately", design);
+            return true;
+        } catch (Exception e) {
+            PackCore.LOGGER.error("StorageDesign: failed to apply via reflection", e);
+            return false;
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private static void applyViaReflection(boolean enable) throws Exception {
+        Class<?> managedConfigClass = Class.forName("moe.nea.firmament.util.data.ManagedConfig");
+        Field companionField = managedConfigClass.getDeclaredField("Companion");
+        companionField.setAccessible(true);
+        Object companion = companionField.get(null);
+
+        Method getAllConfigs = companion.getClass().getDeclaredMethod("getAllManagedConfigs");
+        getAllConfigs.setAccessible(true);
+        Object instanceList = getAllConfigs.invoke(companion);
+        List<Object> configs =
+                (List<Object>) instanceList.getClass().getMethod("getAll").invoke(instanceList);
 
-        boolean enableOverlay = design == StorageDesign.OVERLAY;
+        for (Object config : configs) {
+            String name = (String) config.getClass().getMethod("getName").invoke(config);
+            if (!CONFIG_NAME.equals(name)) continue;
 
-        Minecraft client = Minecraft.getInstance();
-        if (client.player != null) {
-            scheduleCommand(enableOverlay);
-        } else {
-            pendingOverlayState.set(enableOverlay);
-            PackCore.LOGGER.info("StorageDesign: queued command for next world join");
+            Map<String, Object> options =
+                    (Map<String, Object>) config.getClass().getMethod("getAllOptions").invoke(config);
+
+            if (!options.containsKey(OPTION_NAME)) {
+                PackCore.LOGGER.error(
+                        "StorageDesign: option '{}' not found. Available: {}", OPTION_NAME, options.keySet());
+                throw new IllegalStateException(
+                        "Option '" + OPTION_NAME + "' not found in config '" + CONFIG_NAME + "'");
+            }
+            Object option = options.get(OPTION_NAME);
+
+            Method setter = findMethod(option.getClass(), "setValue", Object.class);
+            setter.invoke(option, enable);
+
+            Method save = findMethod(config.getClass(), "markDirty", java.util.concurrent.CompletableFuture.class);
+            save.invoke(config, (Object) null);
+            return;
         }
 
-        return true;
+        List<String> allNames = configs.stream()
+                .map(c -> {
+                    try { return (String) c.getClass().getMethod("getName").invoke(c); }
+                    catch (Exception ex) { return "<error>"; }
+                })
+                .collect(Collectors.toList());
+        PackCore.LOGGER.error(
+                "StorageDesign: config '{}' not found. Known: {}", CONFIG_NAME, allNames);
+        throw new IllegalStateException("Firmament config '" + CONFIG_NAME + "' not found");
     }
 
-    private static void scheduleCommand(boolean enable) {
-        Minecraft client = Minecraft.getInstance();
-        new Thread(() -> {
+    private static Method findMethod(Class<?> start, String name, Class<?>... params)
+            throws NoSuchMethodException {
+        for (Class<?> c = start; c != null; c = c.getSuperclass()) {
             try {
-                Thread.sleep(2000);
-                client.execute(() -> {
-                    LocalPlayer player = client.player;
-                    if (player == null) return;
-                    // /firm config toggle storage-overlay always-replace
-                    // The toggle command flips the value, so we need to check the current state.
-                    String command = "firm config toggle storage-overlay always-replace";
-                    player.connection.sendCommand(command);
-                    PackCore.LOGGER.info("StorageDesign: executed /{}", command);
-                });
-            } catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
+                Method m = c.getDeclaredMethod(name, params);
+                m.setAccessible(true);
+                return m;
+            } catch (NoSuchMethodException ignored) {
+                // keep walking
             }
-        }, "packcore-firmament-config").start();
+        }
+        try {
+            assert start != null;
+            Method m = start.getMethod(name, params);
+            m.setAccessible(true);
+            return m;
+        } catch (NoSuchMethodException ignored) {
+            // fall through
+        }
+        throw new NoSuchMethodException("Cannot find " + name + " on " + start.getName());
     }
 }