Merge pull request #44 from paulcheeba/v13.5.0.0

V13.5.0.0

Author: paulcheeba

README.md

@@ -7,7 +7,7 @@
 # About Time Next
 
 **About Time Next** is a timekeeping and event scheduling utility for Foundry VTT v13+. It is a spiritual successor to about-time by Tim Posney and is built on top of the original code in an attempt to keep legacy functions. 
-It supports **D&D 5e v5.2+ native calendar**, **Seasons & Stars**, **Simple Calendar**, or falls back to Foundry's core time system.
+It supports **D&D 5e v5.2+ native calendar**, **Seasons & Stars**, **Simple Calendar Reborn**, or falls back to Foundry's core time system.
 
 ---
 
@@ -21,10 +21,10 @@ It supports **D&D 5e v5.2+ native calendar**, **Seasons & Stars**, **Simple Cale
    ```
 
 2. Enable the module in your world.
-3. (Optional) Configure calendar system in settings: Auto-detect (default), D&D 5e Calendar, Simple Calendar, Seasons & Stars, or None.
+3. (Optional) Configure calendar system in settings: D&D 5e Calendar, Simple Calendar Reborn, Seasons & Stars, or None (default).
 
 > Compatibility: Designed for FVTT v13 (min 13, max 13.x).  
-> **Calendar Support:** D&D 5e v5.2+ native calendar, Seasons & Stars, Simple Calendar, and core time fallback.  
+> **Calendar Support:** D&D 5e v5.2+ native calendar, Seasons & Stars, Simple Calendar Reborn, and core time fallback.  
 > Settings dropdown dynamically shows only available calendar systems. Detection display shows all systems with status.
 
 ---
@@ -36,18 +36,18 @@ About Time Next uses a **calendar adapter system** to integrate with multiple ca
 **Supported Calendars:**
 - **D&D 5e Calendar (v5.2+)**: Native Foundry v13 calendar system with Harptos, Greyhawk, Gregorian, and Khorvaire calendars.
 - **Seasons & Stars**: Full integration with formatted date/time display.
-- **Simple Calendar**: Legacy compatibility layer retained for reference. Full support depends on a FVTT v13 update of the Simple Calendar module. SC integration may soon be removed if confirmed abandoned.
+- **Simple Calendar Reborn**: Full integration with time authority model. Simple Calendar has been reborn as Simple Calendar Reborn (maintained by Arctis Fireblight for Foundry v13+), and we have integrated it with complete time management support.
 
-**Auto-Detection (Default):**
-When set to "Auto-detect", the module checks in priority order:
-1. Seasons & Stars (if module active with API)
-2. Simple Calendar (if module active with API)
-3. D&D 5e Calendar (if system v5.2+ with calendar configured)
-4. Falls back to "None" (Foundry core time)
-5. Additional calendars to be added in future updates.
+**Neutral Calendar Selection:**
+The module uses neutral selection logic with no automatic favoritism:
+- **0 calendars available** → Uses "None" (Foundry core time)
+- **1 calendar available** → Auto-selects that calendar
+- **2+ calendars available** → Uses "None" and shows selection dialog
+
+All supported calendars (D&D 5e, Simple Calendar Reborn, Seasons & Stars) are treated equally. The module never automatically picks one third-party calendar over another.
 
 **Calendar Integration Settings:**
-- Dropdown shows **only detected** calendars (plus "Auto-detect" and "None")
+- Dropdown shows **only detected** calendars (plus "None")
 - Detection info panel shows **all calendars** with ✓/✗ status
 - If your selected calendar becomes unavailable, module falls back automatically
 
@@ -91,7 +91,7 @@ Enable **“Enable AT Time Manager”** to show a compact panel:
 <img width="300" height="151" alt="image" src="https://github.com/user-attachments/assets/8e631dd5-a7b5-4037-9bc5-28e7bebf7c7e" />
 
 - **Play/Pause world time** (GM)  
-- Live **clock display** (SC-formatted if SC is present)  
+- Live **clock display** (calendar-formatted when available)  
 - Small toggles for realtime behavior (GM):  
   - **Link Pause** (pause realtime if the game is paused)  
   - **Auto-Pause on Combat** (pause/resume around combats)  
@@ -164,7 +164,7 @@ Actions (top buttons):
 - **Send Queue to Chat** (GM-whisper)  
 - **Stop all Events** / **Stop all + 1h reminder**
 
-> Time formatting uses the active calendar adapter (D&D 5e, Seasons & Stars, or Simple Calendar when available). Falls back to Foundry core time if no calendar system is configured.
+> Time formatting uses the active calendar adapter (D&D 5e, Seasons & Stars, or Simple Calendar Reborn when available). Falls back to Foundry core time if no calendar system is configured.
 
 ### Event Notification Cards
 When events trigger, they display standardized notification cards with detailed information:
@@ -262,7 +262,7 @@ Event notifications play automatically when scheduled events fire, helping GMs t
   - M4A (.m4a) - AAC audio, good quality
 Best practice: MP3 is the safest choice for maximum browser compatibility across all platforms (which is why we used it for the notification sounds in v13.2.0.0+).
 
-> Date/time formatting uses the active calendar adapter (D&D 5e, Seasons & Stars, Simple Calendar when available), otherwise it falls back to Foundry core time.
+> Date/time formatting uses the active calendar adapter (D&D 5e, Seasons & Stars, Simple Calendar Reborn when available), otherwise it falls back to Foundry core time.
 
 ---
 
@@ -280,7 +280,6 @@ Best practice: MP3 is the safest choice for maximum browser compatibility across
 - This module is part of the **OverEngineeredVTT Suite** and Requires the installation of the lightweight OEV Suite Monitor, a master module that tracks OEV module versions for you and lets you know when updates or new modules are available.
 
 ## Additional links
-
 - Join our [Discord](https://discord.gg/VNZwZTCB5U) server
 - Support me on [Patreon](https://www.patreon.com/cw/u45257624)
 

about-time.js

@@ -1,5 +1,5 @@
 // about-time.js — Entry point
-// v13.4.0.0 — D&D 5e Calendar integration (native calendar support for D&D 5e v5.2+)
+// v13.5.0.0 — Simple Calendar Reborn (SCR) integration + neutral calendar selection
 
 import { registerSettings, MODULE_ID } from './module/settings.js';
 import { preloadTemplates } from './module/preloadTemplates.js';
@@ -11,7 +11,8 @@ import { DTCalc } from './module/calendar/DTCalc.js';
 // Calendar Adapter System (v13.3.1.0 - Phase 1)
 import { CalendarAdapter } from './module/calendar/CalendarAdapter.js';
 import './module/calendar/Dnd5eAdapter.js'; // Self-registers (v13.3.5.0)
-import './module/calendar/SimpleCalendarAdapter.js'; // Self-registers
+import './module/calendar/SCRAdapter.js'; // Self-registers (v13.4.2.0 - Simple Calendar Reborn)
+// import './module/calendar/SimpleCalendarAdapter.js'; // ARCHIVED - v13 incompatible, preserved for reference
 import './module/calendar/SandSAdapter.js'; // Self-registers
 
 // New (modular, non-destructive)
@@ -192,20 +193,31 @@ Hooks.once('ready', async () => {
 
         let newSystem = "auto"; // Keep auto as default
 
+        // Count how many calendars are available
+        const availableCount = [detected.dnd5e, detected.simpleCalendarReborn, detected.seasonsStars].filter(Boolean).length;
+        
         // If user had explicitly disabled SC, respect that
         if (legacySetting === false) {
           newSystem = "none";
           if (debug) console.log(`${MODULE_ID} | [Migration] User had disabled SC → setting to "none"`);
         }
-        // If user had SC enabled and it's still available, use it explicitly
-        else if (legacySetting === true && detected.simpleCalendar) {
-          newSystem = "simple-calendar";
-          if (debug) console.log(`${MODULE_ID} | [Migration] SC was enabled and is available → setting to "simple-calendar"`);
+        // Only auto-migrate if there's exactly ONE calendar available
+        // If multiple are available, let checkForCalendarChanges() prompt the user
+        else if (legacySetting === true && availableCount === 1) {
+          if (detected.simpleCalendarReborn) {
+            newSystem = "simple-calendar-reborn";
+            if (debug) console.log(`${MODULE_ID} | [Migration] Only SCR available → setting to "simple-calendar-reborn"`);
+          } else if (detected.seasonsStars) {
+            newSystem = "seasons-and-stars";
+            if (debug) console.log(`${MODULE_ID} | [Migration] Only S&S available → setting to "seasons-and-stars"`);
+          } else if (detected.dnd5e) {
+            newSystem = "dnd5e";
+            if (debug) console.log(`${MODULE_ID} | [Migration] Only D&D5e available → setting to "dnd5e"`);
+          }
         }
-        // If SC was enabled but no longer available, check for S&S
-        else if (legacySetting === true && !detected.simpleCalendar && detected.seasonsStars) {
-          newSystem = "seasons-and-stars";
-          if (debug) console.log(`${MODULE_ID} | [Migration] SC unavailable but S&S detected → setting to "seasons-and-stars"`);
+        else if (legacySetting === true && availableCount > 1) {
+          if (debug) console.log(`${MODULE_ID} | [Migration] Multiple calendars available (${availableCount}) → keeping auto to allow user choice`);
+          // Keep auto so checkForCalendarChanges() will prompt
         }
 
         // Save migrated setting
@@ -236,15 +248,6 @@ Hooks.once('ready', async () => {
   // INITIALIZATION
   // ============================================================================
 
-  try {
-    if (game.settings.get(MODULE_ID, "debug")) {
-      if (!game.modules.get("foundryvtt-simple-calendar")?.active) {
-        console.warn(`${MODULE_ID} | Simple Calendar not active (optional).`);
-      }
-    }
-  } catch {
-    // ignore
-  }
   PseudoClock.init();
   ElapsedTime.init();
 
@@ -302,9 +305,23 @@ Hooks.once('ready', () => {
 
 // --- Pause/Combat coupling (merged from 13.0.6.7.4) ---
 Hooks.once('ready', () => {
-  // Keep AT’s internal runner in sync with Foundry’s pause (if linked)
+  // Helper to check if SCR is managing time/pause behavior
+  const isSCRActive = () => {
+    try {
+      const calendarSystem = game.settings.get(MODULE_ID, "calendar-system");
+      return calendarSystem === "simple-calendar-reborn" || 
+             (calendarSystem === "auto" && globalThis.SimpleCalendar?.api);
+    } catch {
+      return false;
+    }
+  };
+
+  // Keep AT's internal runner in sync with Foundry's pause (if linked)
   Hooks.on("pauseGame", (paused) => {
     try {
+      // Skip if SCR is managing pause behavior
+      if (isSCRActive()) return;
+      
       const link = !!getSettingSafe("rtLinkPause", true);
       if (!link) return;
       if (paused) {
@@ -323,6 +340,9 @@ Hooks.once('ready', () => {
   let _rtWasRunning = false;
 
   async function handleCombatStart() {
+    // Skip if SCR is managing combat pause behavior
+    if (isSCRActive()) return;
+    
     // Only act when the first combat appears (collection 0 -> 1)
     const count = (game.combats?.size ?? 0);
     if (count !== 1) return;
@@ -342,6 +362,8 @@ Hooks.once('ready', () => {
   }
 
   async function handleCombatEnd() {
+    // Skip if SCR is managing combat pause behavior
+    if (isSCRActive()) return;
     // Only act when we just removed the last combat (collection 1 -> 0)
     const count = (game.combats?.size ?? 0);
     if (count !== 0) return;

changelog.md

@@ -1,3 +1,131 @@
+# Changelog (v13.5.0.0)
+
+**🎉 MAJOR UPDATE: Simple Calendar Reborn Integration + Neutral Calendar Selection**
+
+**Simple Calendar** has been forked and updated for Foundry v13+ as **Simple Calendar Reborn** by Arctis Fireblight. This release brings full SCR integration to About Time Next with proper time authority delegation.
+
+---
+
+## Simple Calendar Reborn Support ✅
+
+- **New SCRAdapter Class**  
+  Added `SCRAdapter.js` implementing **Time Authority Model B**: When SCR is active, it becomes the authoritative time controller. ATN routes all time manipulation through SCR's API instead of directly modifying `game.time.worldTime`.
+
+- **Time Routing Through Adapters**  
+  All ATN time controls now use the adapter pattern:
+  - Realtime clock → `adapter.advanceTime(seconds)`
+  - Fast forward/rewind buttons → `adapter.advanceTime(seconds)`  
+  - Time-of-day quick jumps → `adapter.advanceTime(seconds)`
+  
+  When SCR is active, these calls route through `SimpleCalendar.api.changeDate()`. When using Seasons & Stars or D&D5e, they use `game.time.advance()` as before.
+
+- **SCR as Time Authority**  
+  When SCR is enabled, it controls worldTime and ATN enhances it with:
+  - Event scheduling and notifications
+  - Elapsed time tracking
+  - Additional UI controls (mini panel, toolbar)
+  
+  ATN respects SCR's pause/combat settings and bypasses its own hooks to prevent conflicts.
+
+- **0-Based Indexing Support**  
+  SCRAdapter correctly handles Simple Calendar's 0-based month/day indexing (JavaScript Date-style), converting to 1-based display for users while maintaining API compatibility.
+
+---
+
+## Neutral Calendar Selection 🤝
+
+- **No Calendar Hierarchy**  
+  Removed the concept of "top-tier" calendars. All supported calendars (D&D5e, Simple Calendar Reborn, Seasons & Stars) are now treated equally.
+
+- **Ethical Auto-Detection**  
+  - **0 calendars available** → Use "none" (Foundry core time)
+  - **1 calendar available** → Auto-select that calendar (no favoritism)
+  - **2+ calendars available** → Use "none", show selection dialog
+  
+  ATN no longer automatically picks one third-party calendar over another.
+
+- **Selection Dialog for Multiple Calendars**  
+  When multiple calendars are detected, GMs see a dropdown with all available options sorted alphabetically. Users make an explicit choice with a note: "All calendar systems are equivalent. Choose based on your preference."
+
+- **Change Detection**  
+  Dialog appears when new calendar modules are enabled, even if you're already using a different calendar system. Users are always informed of their options.
+
+---
+
+## Settings UI Enhancements 🎨
+
+- **Calendar System Dropdown Tooltip**  
+  Added explanation of time authority: "⚙️ Time Authority: SCR controls worldTime when active; ATN manages worldTime for D&D5e/S&S."
+
+- **Detection Display Updates**  
+  Calendar detection info now shows which system manages time:
+  - "✓ D&D 5e Calendar (available) - *Uses ATN Time Management*"
+  - "✓ Simple Calendar Reborn (available) - *Uses SCR Time Management*"
+  - "✓ Seasons & Stars (available) - *Uses ATN Time Management*"
+
+- **Smart Checkbox Disabling**  
+  When SCR is active, ATN's pause/combat settings are disabled with informational boxes showing SCR's equivalent settings:
+  - `rtAutoPauseCombat` → Shows SCR's `combatRunning` value
+  - `rtLinkPause` → Shows SCR's `unifyGameAndClockPause` value
+  
+  Both display: "⚠️ **Managed by SCR:** [setting status]"
+
+---
+
+## Architecture Improvements 🏗️
+
+- **Time Authority Models**  
+  Formalized two patterns:
+  - **Model A** (S&S, D&D5e): ATN controls time, calendar provides display
+  - **Model B** (SCR): Calendar controls time, ATN enhances with events
+
+- **Logic Bypass for SCR**  
+  Added `isSCRActive()` helper in `about-time.js` that skips ATN's pause/combat hooks when SCR is managing behavior, preventing conflicts.
+
+- **Timestamp-Based Events Confirmed**  
+  Events are stored as timestamps (seconds since epoch), making them calendar-agnostic. Switching between calendars preserves all events—only display format changes.
+
+---
+
+## Documentation 📚
+
+- **SCR-ref-Doc.md**  
+  Comprehensive Simple Calendar Reborn API reference with ATN integration patterns, time authority explanation, and 0-based indexing notes.
+
+- **SCR-Integration-Summary.md**  
+  Complete implementation guide covering time routing architecture, settings UI changes, logic bypass, and testing checklist.
+
+- **Updated Reference Documentation**  
+  `referenceDocumentation.md` now includes calendar system status, adapter architecture, and integration details for all supported calendars.
+
+---
+
+## User Interface Refinements 🎨
+
+- A new calendar scan is run on load and shows a dialog allowing you to pick the calendar you want ATN to use. This may be dismissed until the next load or until a different calendar is selected in the settings page.
+
+---
+
+## Documentation Updates 📚
+
+- **README.md**  
+  Updated all Simple Calendar references to Simple Calendar Reborn with integration notes. Added explanation that Simple Calendar has been reborn and is now fully integrated with ATN.
+
+---
+
+## Migration Notes 📝
+
+- **Legacy Simple Calendar**  
+  Simple Calendar v1.x is archived and incompatible with Foundry v13. Users should migrate to Simple Calendar Reborn v2.4.0+.
+
+- **Existing Events**  
+  All existing events continue to work. Event timestamps are calendar-agnostic, so switching between SCR, S&S, and D&D5e preserves event timing.
+
+- **Settings**  
+  First-time users with multiple calendars will see a selection dialog. Existing users keep their current selection unless they enable additional calendar modules.
+
+---
+
 # Changelog (v13.4.1.0)
 
 **Dependencies + Docs**

macros/debugSettingsUI.js

@@ -53,15 +53,21 @@ if (calendarInput) {
     if (!detectionBox && hint) {
       console.log("\n4. Detection box missing - manually adding...");
 
-      const detected = window.AboutTimeNext?.CalendarAdapter?.detectAvailableAsObject() || { simpleCalendar: false, seasonsStars: false };
+      const detected = window.AboutTimeNext?.CalendarAdapter?.detectAvailableAsObject() || { dnd5e: false, simpleCalendarReborn: false, seasonsStars: false };
 
       let detectionHTML = '<div style="margin-top: 0.5em; padding: 0.5em; background: rgba(0,0,0,0.1); border-radius: 3px; font-size: 0.9em;">';
       detectionHTML += '<strong>Detected Calendar Modules:</strong><br>';
 
-      if (detected.simpleCalendar) {
-        detectionHTML += '✓ Simple Calendar (available)<br>';
+      if (detected.dnd5e) {
+        detectionHTML += '✓ D&D 5e Calendar (available)<br>';
       } else {
-        detectionHTML += '✗ Simple Calendar (not detected)<br>';
+        detectionHTML += '✗ D&D 5e Calendar (not detected)<br>';
+      }
+      
+      if (detected.simpleCalendarReborn) {
+        detectionHTML += '✓ Simple Calendar Reborn (available)<br>';
+      } else {
+        detectionHTML += '✗ Simple Calendar Reborn (not detected)<br>';
       }
 
       if (detected.seasonsStars) {

module/ATMiniPanel.js

@@ -1,5 +1,5 @@
 // module/ATMiniPanel.js
-// v13.3.4.0 — Refactored to use CalendarAdapter for time formatting
+// v13.5.0.0 — Time controls route through CalendarAdapter.advanceTime()
 
 import { MODULE_ID } from "./settings.js";
 import { CalendarAdapter } from "./calendar/CalendarAdapter.js";
@@ -435,7 +435,10 @@ function wireBehavior(ctx) {
       const s = parseDuration(d[id] || "0");
       if (!s) return;
       const sign = id?.startsWith("rwd") ? -1 : +1;
-      await game.time.advance(sign * s);
+      // Route time advancement through calendar adapter
+      // When SCR is active, this delegates to SCR's time control
+      const adapter = game.abouttime.CalendarAdapter.getActive();
+      await adapter.advanceTime(sign * s);
     };
     steps.querySelectorAll(".atmp-btn").forEach((b) => {
       b.addEventListener("click", onStep);
@@ -456,7 +459,10 @@ function wireBehavior(ctx) {
       else if (id === "midnight") targetSOD = 0;
       if (targetSOD == null) return;
       const delta = secondsToNextBoundary(targetSOD);
-      if (delta > 0) await game.time.advance(delta);
+      // Route time advancement through calendar adapter
+      // When SCR is active, this delegates to SCR's time control
+      const adapter = game.abouttime.CalendarAdapter.getActive();
+      if (delta > 0) await adapter.advanceTime(delta);
     };
     tod.querySelectorAll(".atmp-btn").forEach((b) => {
       b.addEventListener("click", onTod);