Refactor GuiStyle (old config) into the proper config, and streamline it

Author: Aedial

.github/ISSUE_TEMPLATE/bug_report.md

@@ -4,6 +4,12 @@ about: Create a report to help us improve
 labels: bug
 ---
 
+## Checklist before submitting
+- [ ] I have checked the existing issues (including closed) to make sure this bug has not already been reported/fixed
+- [ ] I am using the latest version of Spellcaster's Archives
+- [ ] I can reproduce this issue consistently
+- [ ] I have isolated the issue to Spellcaster's Archives and X mod(s) (optional but recommended)
+
 ## Describe the bug
 A clear and concise description of what the bug is.
 
@@ -18,8 +24,7 @@ Steps to reproduce the behavior:
 A clear and concise description of what you expected to happen.
 
 ## Logs and crash reports
-- Attach `logs/latest.log` and any crash report from `crash-reports/`.
-- If relevant, include the OpenComputers program snippet you ran.
+- Attach `logs/latest.log` and any crash report from `crash-reports/` (anonymize any PII).
 
 ## Screenshots
 If applicable, add screenshots to help explain your problem.

CHANGELOG.md

@@ -7,6 +7,15 @@ The format is based on Keep a Changelog and this project adheres to Semantic Ver
 - Keep a Changelog: https://keepachangelog.com/en/1.1.0/
 - Semantic Versioning: https://semver.org/spec/v2.0.0.html
 
+## [0.4.6] - 2025-11-19
+### Added
+- Add "Easy layout" toggle in config, that will try to automatically adjust the right panel width.
+  - When enabled, the right panel width will be set to fit all spell content, up to a maximum of 65% of GUI width.
+  - It will try to fit the name fully without ellipsis, up to 50% of GUI width.
+
+### Fixed
+- Fix issue of books list not being shifted far enough on non-zero pages, causing a noticeable overlap of books between pages.
+
 ## [0.4.5] - 2025-11-17
 ### Fixed
 - Fix Spell books from other mods using ebwizardry Spell books, resulting in broken books and not being able to extract them correctly.

build.gradle

@@ -15,7 +15,7 @@ buildscript {
 
 apply plugin: 'net.minecraftforge.gradle.forge'
 
-version = "0.4.5"
+version = "0.4.6"
 group = "com.spellarchives"
 archivesBaseName = "spellarchives"
 

src/main/java/com/spellarchives/SpellArchives.java

@@ -23,7 +23,7 @@
 public class SpellArchives {
     public static final String MODID = "spellarchives";
     public static final String NAME = "Spellcaster's Archives";
-    public static final String VERSION = "0.4.5";
+    public static final String VERSION = "0.4.6";
     public static final Log LOGGER = new Log();
 
     @SidedProxy(clientSide = "com.spellarchives.client.ClientProxy", serverSide = "com.spellarchives.CommonProxy")

src/main/java/com/spellarchives/block/BlockSpellArchive.java

@@ -95,7 +95,7 @@ public EnumBlockRenderType getRenderType(IBlockState state) {
     /**
      * Advertise that this block supports horizontal rotations via tools. Returning the four
      * horizontal faces allows wrenches to attempt rotation rather than remove/re-place.
-     * 
+     *
      * @param world World containing the block (not used).
      * @param pos Position of the block (not used).
      */

src/main/java/com/spellarchives/client/ClientConfig.java

@@ -20,7 +20,7 @@
 import net.minecraftforge.fml.client.config.IConfigElement;
 
 import com.spellarchives.SpellArchives;
-import com.spellarchives.gui.GuiStyle;
+import com.spellarchives.config.ClientConfig;
 import com.spellarchives.config.SpellArchivesConfig;
 
 
@@ -98,7 +98,7 @@ public void onGuiClosed() {
         Configuration guiCfg = ClientConfig.getConfiguration();
         if (guiCfg != null && guiCfg.hasChanged()) guiCfg.save();
 
-        net.minecraftforge.common.config.Configuration gameplayCfg = com.spellarchives.config.SpellArchivesConfig.getConfiguration();
+        Configuration gameplayCfg = SpellArchivesConfig.getConfiguration();
         if (gameplayCfg != null && gameplayCfg.hasChanged()) gameplayCfg.save();
     }
 }

src/main/java/com/spellarchives/client/ClientConfigGuiFactory.java

@@ -3,8 +3,7 @@
 import net.minecraftforge.common.MinecraftForge;
 
 import com.spellarchives.CommonProxy;
-import com.spellarchives.client.ClientConfig;
-import com.spellarchives.gui.GuiStyle;
+import com.spellarchives.config.ClientConfig;
 import com.spellarchives.registry.ClientModels;
 
 
@@ -22,6 +21,5 @@ public void preInit() {
 
         // Initialize client-side config and apply GUI style overrides
         ClientConfig.init();
-        GuiStyle.reloadFromConfig();
     }
 }

src/main/java/com/spellarchives/client/ClientProxy.java

@@ -1,4 +1,4 @@
-package com.spellarchives.render;
+package com.spellarchives.client;
 
 import java.awt.image.BufferedImage;
 import java.io.IOException;
@@ -15,13 +15,13 @@
 import net.minecraft.client.resources.IResourceManager;
 import net.minecraft.util.ResourceLocation;
 
-import com.spellarchives.gui.GuiStyle;
+import com.spellarchives.config.ClientConfig;
 import com.spellarchives.util.TextUtils;
 
 
 /**
  * Centralized factory for dynamic textures used by the GUI. Caches textures and invalidates
- * them automatically when relevant configuration changes (tracked via GuiStyle.CONFIG_REVISION).
+ * them automatically when relevant configuration changes (tracked via ClientConfig.CONFIG_REVISION).
  */
 public final class DynamicTextureFactory {
     private DynamicTextureFactory() {}
@@ -31,15 +31,15 @@ private DynamicTextureFactory() {}
     private static int cacheRevision = -1;
 
     private static void checkRevision() {
-        if (cacheRevision != GuiStyle.CONFIG_REVISION) {
+        if (cacheRevision != ClientConfig.CONFIG_REVISION) {
             // Attempt to delete previously registered dynamic textures from the texture manager
             TextureManager tm = Minecraft.getMinecraft().getTextureManager();
             for (ResourceLocation rl : spineCache.values()) tm.deleteTexture(rl);
             for (ResourceLocation rl : bgCache.values()) tm.deleteTexture(rl);
 
             spineCache.clear();
             bgCache.clear();
-            cacheRevision = GuiStyle.CONFIG_REVISION;
+            cacheRevision = ClientConfig.CONFIG_REVISION;
         }
     }
 
@@ -56,7 +56,7 @@ private static void checkRevision() {
      */
     public static ResourceLocation getOrCreateSpineTexture(int baseRgb, int w, int h, ResourceLocation iconRl, int iconSize) {
         checkRevision();
-        String key = baseRgb + "_" + w + "x" + h + (iconRl != null && GuiStyle.SPINE_EMBED_ICON ? ("|icon=" + iconRl.toString() + "|s=" + iconSize) : "");
+        String key = baseRgb + "_" + w + "x" + h + (iconRl != null && ClientConfig.SPINE_EMBED_ICON ? ("|icon=" + iconRl.toString() + "|s=" + iconSize) : "");
         ResourceLocation existing = spineCache.get(key);
         if (existing != null) return existing;
         // Full generator: curvature, vertical shading, deterministic noise, optional bands and icon embedding
@@ -89,17 +89,17 @@ public static ResourceLocation getOrCreateSpineTexture(int baseRgb, int w, int h
         // Off-center bias for spine curvature
         float centerBias = 0.5f + (rf.apply(s1) - 0.5f) * 0.18f; // 0.32..0.68
         centerBias = Math.max(0.3f, Math.min(0.7f, centerBias));
-        float asymTilt = GuiStyle.SPINE_ENABLE_TILT ? (rf.apply(s2) - 0.5f) * 0.12f : 0f; // -0.06..0.06
-        float noiseAmp = GuiStyle.SPINE_ENABLE_NOISE ? GuiStyle.SPINE_NOISE_AMPLITUDE : 0f; // +/- percentage noise
+        float asymTilt = ClientConfig.SPINE_ENABLE_TILT ? (rf.apply(s2) - 0.5f) * 0.12f : 0f; // -0.06..0.06
+        float noiseAmp = ClientConfig.SPINE_ENABLE_NOISE ? ClientConfig.SPINE_NOISE_AMPLITUDE : 0f; // +/- percentage noise
 
         // Two horizontal bands near the top of available area above icon reserve
-        int iconReserve = GuiStyle.SPINE_ICON_SIZE + GuiStyle.SPINE_ICON_BOTTOM_MARGIN; // reserve for bottom icon area
+        int iconReserve = ClientConfig.SPINE_ICON_SIZE + ClientConfig.SPINE_ICON_BOTTOM_MARGIN; // reserve for bottom icon area
         int available = Math.max(0, h - iconReserve);
-        int bandThickness = GuiStyle.SPINE_BAND_THICKNESS;
-        int bandGap = GuiStyle.SPINE_BAND_GAP;
+        int bandThickness = ClientConfig.SPINE_BAND_THICKNESS;
+        int bandGap = ClientConfig.SPINE_BAND_GAP;
 
         // Place bands starting at top with a small top space
-        int band1 = available > 0 ? Math.min(available - bandThickness, GuiStyle.SPINE_BAND_TOP_SPACE) : -1;
+        int band1 = available > 0 ? Math.min(available - bandThickness, ClientConfig.SPINE_BAND_TOP_SPACE) : -1;
         int band2 = band1 >= 0 ? Math.min(available - bandThickness, band1 + bandThickness + bandGap) : -1;
 
         for (int y = 0; y < h; y++) {
@@ -109,15 +109,15 @@ public static ResourceLocation getOrCreateSpineTexture(int baseRgb, int w, int h
                 float dist = Math.abs(nx - centerBias) * 2f; // 0 center -> ~1 edges
                 float side = Math.signum(nx - centerBias);
                 dist *= (1f + asymTilt * side);
-                float shade = GuiStyle.SPINE_ENABLE_CURVATURE
-                    ? (GuiStyle.SPINE_CENTER_BRIGHTEN - GuiStyle.SPINE_EDGE_FACTOR * dist)
+                float shade = ClientConfig.SPINE_ENABLE_CURVATURE
+                    ? (ClientConfig.SPINE_CENTER_BRIGHTEN - ClientConfig.SPINE_EDGE_FACTOR * dist)
                     : 1.0f;
                 int rgb = TextUtils.darkenColor(baseRgb, shade);
 
                 // Subtle horizontal roll-off towards top/bottom
                 float ny = (y + 0.5f) / h;
                 float edgeY = Math.min(ny, 1f - ny) * 2f; // 0 at edges, 1 at center
-                float vshade = GuiStyle.SPINE_VSHADE_BASE + GuiStyle.SPINE_VSHADE_RANGE * edgeY; // darker near top/bottom
+                float vshade = ClientConfig.SPINE_VSHADE_BASE + ClientConfig.SPINE_VSHADE_RANGE * edgeY; // darker near top/bottom
                 rgb = TextUtils.darkenColor(rgb, vshade);
 
                 // Per-pixel noise to break uniformity (deterministic)
@@ -131,36 +131,36 @@ public static ResourceLocation getOrCreateSpineTexture(int baseRgb, int w, int h
         }
 
         // Apply horizontal bands post-pass for clean thin lines (darken slightly)
-        if (GuiStyle.SPINE_ENABLE_BANDS && band1 >= 0) {
+        if (ClientConfig.SPINE_ENABLE_BANDS && band1 >= 0) {
             for (int x = 0; x < w; x++) {
                 for (int dy = 0; dy < bandThickness; dy++) { // 2px thickness
                     int yy = band1 + dy;
                     if (yy >= 0 && yy < h) {
                         int idx = yy * w + x;
                         int rgb = pixels[idx] & 0xFFFFFF;
-                        pixels[idx] = 0xFF000000 | (TextUtils.darkenColor(rgb, GuiStyle.SPINE_BAND1_DARKEN) & 0xFFFFFF);
+                        pixels[idx] = 0xFF000000 | (TextUtils.darkenColor(rgb, ClientConfig.SPINE_BAND1_DARKEN) & 0xFFFFFF);
                     }
                 }
             }
         }
 
-        if (GuiStyle.SPINE_ENABLE_BANDS && band2 >= 0) {
+        if (ClientConfig.SPINE_ENABLE_BANDS && band2 >= 0) {
             for (int x = 0; x < w; x++) {
                 for (int dy = 0; dy < bandThickness; dy++) {
                     int yy = band2 + dy;
                     if (yy >= 0 && yy < h) {
                         int idx = yy * w + x;
                         int rgb = pixels[idx] & 0xFFFFFF;
-                        pixels[idx] = 0xFF000000 | (TextUtils.darkenColor(rgb, GuiStyle.SPINE_BAND2_DARKEN) & 0xFFFFFF);
+                        pixels[idx] = 0xFF000000 | (TextUtils.darkenColor(rgb, ClientConfig.SPINE_BAND2_DARKEN) & 0xFFFFFF);
                     }
                 }
             }
         }
 
         // Optionally embed the element icon into the spine texture (bottom-centered)
-        if (GuiStyle.SPINE_EMBED_ICON && iconRl != null && iconSize > 0) {
+        if (ClientConfig.SPINE_EMBED_ICON && iconRl != null && iconSize > 0) {
             int ix = (w - iconSize) / 2;
-            int iy = (h - iconSize - GuiStyle.SPINE_ICON_BOTTOM_MARGIN) + GuiStyle.SPINE_ICON_Y_OFFSET;
+            int iy = (h - iconSize - ClientConfig.SPINE_ICON_BOTTOM_MARGIN) + ClientConfig.SPINE_ICON_Y_OFFSET;
 
             if (ix >= 0 && iy >= 0 && ix + iconSize <= w && iy + iconSize <= h) {
                 try {
@@ -228,12 +228,12 @@ public static ResourceLocation getOrCreateSpineTexture(int baseRgb, int w, int h
     public static ResourceLocation getOrCreatePanelBg(int w, int h) {
         checkRevision();
 
-        String key = "bg_" + w + "x" + h + "_rev" + GuiStyle.CONFIG_REVISION;
+        String key = "bg_" + w + "x" + h + "_rev" + ClientConfig.CONFIG_REVISION;
         ResourceLocation existing = bgCache.get(key);
         if (existing != null) return existing;
 
-        int topColor = GuiStyle.BACKGROUND_FILL;
-        int bottomColor = GuiStyle.BACKGROUND_BORDER;
+        int topColor = ClientConfig.BACKGROUND_FILL;
+        int bottomColor = ClientConfig.BACKGROUND_BORDER;
         int[] pixels = new int[w * h];
         for (int y = 0; y < h; y++) {
             float t = y / (float)Math.max(1, h - 1);

…chives/render/DynamicTextureFactory.java …chives/client/DynamicTextureFactory.javasrc/main/java/com/spellarchives/render/DynamicTextureFactory.java renamed to src/main/java/com/spellarchives/client/DynamicTextureFactory.java src/main/java/com/spellarchives/render/DynamicTextureFactory.java renamed to src/main/java/com/spellarchives/client/DynamicTextureFactory.java

@@ -100,7 +100,7 @@ public static void onModelBake(ModelBakeEvent event) {
             try {
                 // Build texture map with randomized corner textures and spell icons
                 Map<String, String> textures = new HashMap<>();
-                
+
                 // Keep base textures
                 textures.put("particle", "ebwizardry:blocks/dark_oak_bookshelf_top");
                 textures.put("side", "ebwizardry:blocks/dark_oak_bookshelf_side");
@@ -110,7 +110,7 @@ public static void onModelBake(ModelBakeEvent event) {
                 ResourceLocation leftIcon = WizardryTextureStitcher.getCoreSideSpellIcon(0);
                 ResourceLocation rightIcon = WizardryTextureStitcher.getCoreSideSpellIcon(1);
                 ResourceLocation backIcon = WizardryTextureStitcher.getCoreSideSpellIcon(2);
-                
+
                 // Convert spell icon paths: remove .png extension and adjust path
                 String leftPath = convertResourcePath(leftIcon);
                 String rightPath = convertResourcePath(rightIcon);
@@ -119,7 +119,7 @@ public static void onModelBake(ModelBakeEvent event) {
                 textures.put("spell_left", leftPath);
                 textures.put("spell_right", rightPath);
                 textures.put("spell_back", backPath);
-                
+
                 // Randomized corner textures
                 for (int corner = 0; corner < 8; corner++) {
                     String element = WizardryTextureStitcher.getCornerElement(corner);
@@ -163,13 +163,13 @@ public static void onModelBake(ModelBakeEvent event) {
                     DefaultVertexFormats.BLOCK,
                     getter
                 );
-                
+
                 // Register under the actual per-books path so blockstate resolves without reload
                 event.getModelRegistry().putObject(modelLocation, bakedModel);
                 // Also register under the canonical 'spell_archive' path for safety (books property included in variant)
                 ModelResourceLocation canonicalLoc = new ModelResourceLocation(baseLoc, variant);
                 event.getModelRegistry().putObject(canonicalLoc, bakedModel);
-                
+
             } catch (Exception e) {
                 SpellArchives.LOGGER.error("Failed to retexture spell archive model for " + variant, e);
             }