From f4686960715762cb6fada4f7a03b0bf5422198c1 Mon Sep 17 00:00:00 2001
From: PHIDIAS <phidias@aperx.org>
Date: Fri, 5 Jun 2026 22:18:54 +0900
Subject: [PATCH] .

---
 PHI-CL/data.lua          | 10 +++++-----
 PHI-CL/data/b/gm-sap.lua |  6 ++----
 PHI-CL/data/b/gm-vp.lua  |  6 ++----
 PHI-CL/data/b/mc.lua     | 10 ++++++++++
 PHI-CL/data/b/sa.lua     |  3 +++
 5 files changed, 22 insertions(+), 13 deletions(-)
 create mode 100644 PHI-CL/data/b/mc.lua

diff --git a/PHI-CL/data.lua b/PHI-CL/data.lua
index 3979c65..f620dc7 100644
--- a/PHI-CL/data.lua
+++ b/PHI-CL/data.lua
@@ -11,15 +11,15 @@ if (settings.startup['PHI-MI'].value and settings.startup['PHI-MI-GENERIC'].valu
     require('data.b.mig')
 end
 
-if mods['space-age'] then
+if settings.startup['PHI-SA'].value or (settings.startup['PHI-GM'].value and settings.startup['PHI-GM'].value ~= '') then
     require('data.b.sa')
-
-    if settings.startup['PHI-GM'].value and settings.startup['PHI-GM'].value ~= '' then
-        require('data.b.gm')
-    end
 end
 
 if settings.startup['PHI-GM'].value then
+    if settings.startup['PHI-GM'].value ~= '' then
+        require('data.b.gm')
+    end
+
     if settings.startup['PHI-GM'].value == 'SAP' then
         require('data.b.gm-sap')
 
diff --git a/PHI-CL/data/b/gm-sap.lua b/PHI-CL/data/b/gm-sap.lua
index 324e02e..289f13e 100644
--- a/PHI-CL/data/b/gm-sap.lua
+++ b/PHI-CL/data/b/gm-sap.lua
@@ -1,8 +1,6 @@
+local mc = require('mc')
 
-if not mods['space-age'] then
-    error('Mod not found\nSpace Age is not enabled\n太空時代尚未啟用\nSpace Age が有効になっていません')
-    return
-end
+mc.space_age()
 
 -- GM-SAP C 2 SPACE_AGE RESOURCE
 for _, v in pairs({'lithium-brine', 'fluorine-vent'}) do
diff --git a/PHI-CL/data/b/gm-vp.lua b/PHI-CL/data/b/gm-vp.lua
index a1dfd98..aace6cb 100644
--- a/PHI-CL/data/b/gm-vp.lua
+++ b/PHI-CL/data/b/gm-vp.lua
@@ -1,11 +1,9 @@
 local items = require('gm-vp-c')
 local mbm = require('mbm-c')
+local mc = require('mc')
 local item_sounds = require('__base__/prototypes/item_sounds')
 
-if not mods['space-age'] then
-    error('Mod not found\nSpace Age is not enabled\n太空時代尚未啟用\nSpace Age が有効になっていません')
-    return
-end
+mc.space_age()
 
 -- GM-VP C 33 BASE ENTITY
 -- GM-VP C 6 ELEVATED_RAILS ENTITY
diff --git a/PHI-CL/data/b/mc.lua b/PHI-CL/data/b/mc.lua
new file mode 100644
index 0000000..a8f4477
--- /dev/null
+++ b/PHI-CL/data/b/mc.lua
@@ -0,0 +1,10 @@
+local main = {}
+
+function main.space_age()
+    if not mods['space-age'] then
+        error('Mod not found\nSpace Age is not enabled\n太空時代尚未啟用\nSpace Age が有効になっていません')
+        return
+    end
+end
+
+return main
diff --git a/PHI-CL/data/b/sa.lua b/PHI-CL/data/b/sa.lua
index e9c24f3..84b0320 100644
--- a/PHI-CL/data/b/sa.lua
+++ b/PHI-CL/data/b/sa.lua
@@ -1,3 +1,6 @@
+local mc = require('mc')
+
+mc.space_age()
 
 local function spoil_handle(i)
     i.spoil_ticks = nil