Align Writing Desk numerals with Legacy glyphs (#43)

src/main/java/net/dnorberg/rivencraft/client/SymbolPageTextures.java

@@ -196,7 +196,7 @@ public final class SymbolPageTextures {
         graphics.setColor(1F, 1F, 1F, 1F);
     }
 
-    /** Legacy's single-number marks; numbers above 24 use positional base 25. */
+    /** Overlay each Legacy digit's components; place base-25 digits side by side. */
     public static void drawNumeral(GuiGraphics graphics, int number, int x, int y, int size) {
         int[] digits = SymbolNumerals.digitsFor(number);
         int digitSize = digits.length == 1 ? size : Math.max(8, size * 3 / 4);

src/main/java/net/dnorberg/rivencraft/client/screen/WritingDeskScreen.java

@@ -151,8 +151,8 @@ public final class WritingDeskScreen extends AbstractContainerScreen<WritingDesk
             if (tab == menu.activeCollection() && !allMode) graphics.setColor(0.5F, 0.5F, 1F, 1F);
             graphics.blit(LEGACY_DESK, x, tabY, 0, 166, 58, 37);
             graphics.setColor(1F, 1F, 1F, 1F);
-            // Encode the visible one-based tab number with Legacy's numeric word glyph.
-            SymbolPageTextures.drawNumeral(graphics, tab + 1, x + 8, tabY + 3, 19);
+            // Legacy numbers its Writing Desk collections from zero.
+            SymbolPageTextures.drawNumeral(graphics, tab, x + (tab < 25 ? 8 : 4), tabY + 3, 19);
             ItemStack collection = menu.getSlot(tab).getItem();
             if (!collection.isEmpty()) {
                 String name = collection.getHoverName().getString();
@@ -227,7 +227,7 @@ public final class WritingDeskScreen extends AbstractContainerScreen<WritingDesk
             else if (mouseX < leftPos + 34 && localY >= 29 && localY < 177) {
                 int tab = menu.firstVisibleTab() + (localY - 29) / 37;
                 graphics.renderTooltip(font, Component.translatable("screen.rivencraft.writing_desk.tab_symbol",
-                        tab + 1), mouseX, mouseY);
+                        tab), mouseX, mouseY);
             }
         }
     }

src/main/java/net/dnorberg/rivencraft/gametest/WritingDataGameTests.java

@@ -151,11 +151,23 @@ public final class WritingDataGameTests {
                 "Zero must use Legacy's dedicated number mark");
         helper.assertTrue(Arrays.equals(SymbolNumerals.componentsForDigit(1), new int[] {56}),
                 "One must use Legacy's first bottom-row mark");
+        helper.assertTrue(Arrays.equals(SymbolNumerals.componentsForDigit(5), new int[] {60}),
+                "Five must use Legacy's first five-step mark");
+        helper.assertTrue(Arrays.equals(SymbolNumerals.componentsForDigit(10), new int[] {61}),
+                "Ten must use Legacy's second five-step mark");
+        helper.assertTrue(Arrays.equals(SymbolNumerals.componentsForDigit(14), new int[] {61, 59}),
+                "Fourteen must overlay the ten and four marks");
+        helper.assertTrue(Arrays.equals(SymbolNumerals.componentsForDigit(20), new int[] {63}),
+                "Twenty must use Legacy's final five-step mark");
         helper.assertTrue(Arrays.equals(SymbolNumerals.componentsForDigit(24), new int[] {63, 59}),
                 "Twenty-four must combine Legacy's five and unit marks");
         helper.assertTrue(Arrays.equals(SymbolNumerals.digitsFor(25), new int[] {1, 0}),
                 "Twenty-five must start a second base-25 place");
-        helper.assertTrue(Arrays.equals(SymbolNumerals.digitsFor(88), new int[] {3, 13}),
+        helper.assertTrue(Arrays.equals(SymbolNumerals.digitsFor(49), new int[] {1, 24}),
+                "Forty-nine must use twenty-four in its ones place");
+        helper.assertTrue(Arrays.equals(SymbolNumerals.digitsFor(50), new int[] {2, 0}),
+                "Fifty must carry into the second base-25 place");
+        helper.assertTrue(Arrays.equals(SymbolNumerals.digitsFor(87), new int[] {3, 12}),
                 "Last writing-desk tab must retain its numeric value");
 
         String display = "\"name\":\"symbol.example.test\","

src/main/java/net/dnorberg/rivencraft/writing/SymbolNumerals.java

@@ -1,8 +1,8 @@
 package net.dnorberg.rivencraft.writing;
 
 /**
- * Number components from Mystcraft Legacy's ModWords#constructNumber.
- * Legacy registers 0–25; larger Rivencraft tab numbers use positional base 25.
+ * Positional base-25 numerals using Mystcraft Legacy's 0–24 digit components.
+ * Components within one digit are layered in the same square, not laid side by side.
  */
 public final class SymbolNumerals {
     private SymbolNumerals() {}
@@ -19,7 +19,7 @@ public final class SymbolNumerals {
     }
 
     public static int[] componentsForDigit(int digit) {
-        if (digit < 0 || digit >= 25) throw new IllegalArgumentException("Numeral digit must be in [0, 24]");
+        if (digit < 0 || digit >= 25) throw new IllegalArgumentException("Base-25 digit must be in [0, 24]");
         if (digit == 0) return new int[] {1};
         int fifths = digit / 5;
         int remainder = digit % 5;