') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); ModuleMan Refactoring and Improvements by Causeless · Pull Request #8 · cortex-command-community/Cortex-Command-Community-Project · GitHub
Skip to content

ModuleMan Refactoring and Improvements - #8

Open
Causeless wants to merge 80 commits into
developmentfrom
ModuleMan
Open

ModuleMan Refactoring and Improvements#8
Causeless wants to merge 80 commits into
developmentfrom
ModuleMan

Conversation

@Causeless

@CauselessCauseless commented Jan 5, 2024

Copy link
Copy Markdown
Contributor

Refactors a buncha stuff, simplifies PresetMan by moving stuff to a new ModuleMan. Allows runtime enabling+disabling of mods, though likely needs a little extra work.

MaximDude's work

@MaximDude
Init ModuleMan
0f1c74a
@MaximDude
Preliminary cleanup in PresetMan
78bac76
@MaximDude
Move disabled mods list form SettingsMan to ModuleMan
fb02e2e
@MaximDude
VS being stupid about filters for the 9001th time
43db9cd
@MaximDude
Move all DataModule handling from PresetMan to ModuleMan and enter hell
5f75ded
@MaximDude
Unclusterfucking (followup to5f75ded)
401f710
@MaximDude
Shittily make this compile
a05875f
@MaximDude
Remove a bunch of unnecessary includes
4d860b4
@MaximDude
Destroy ModuleMan instead of PresetMan (followup toa05875f)
b792f6c
@MaximDude
Measure module loading time in Main
65abdbb
@MaximDude
Expose ModuleMan to Lua
bc6b276
@MaximDude
Remove ModuleMan::LoadDataModule Lua binding - this is kinda bullshit…
abe564b
… and shouldn't be exposed
Modules are (currently) either loaded or not (if disabled via mod manager)
Can't allow some bullshit module that is either outside the Data/Mods directories or hidden inside another module to be loaded like this and possibly break all the shit
@MaximDude
Misc changes in Main arg handling
97afdf6
@MaximDude
More unclusterfucking (followup to5f75ded)
d026aff
@MaximDude
Forgot to actually register ModuleMan in master state (followup tobc…
01096e2
…6b276)
@MaximDude
Cleanup, formatting and partial refactor in PresetMan
00c8b9d
@MaximDude
I accidentally (followup tobc6b276)
126d5a2
@MaximDude
Simplify PresetMan by group, by type and random Entity list getters -…
5773dd5
… so much pointless code
@MaximDude
Refactor DataModule type flags - use an enum
895556c
@MaximDude
Remove PresetMan TotalGroupRegister - we just get everything we need …
f2d7b90
…directly from the modules
@MaximDude
Don't assign module IDs at DataModule creation - ModuleMan will assig…
e5c02b8
…n IDs when loading
@MaximDude
Use DataModuleType instead of separate params in ModuleMan::LoadDataM…
8ba00c7
…odule (followup to 895556c)
@MaximDude
Pull loading userdata modules into private method and merge with Data…
abafd37
…Module::CreateOnDiskAsUserdata
Don't need this exposed to all the things, ModuleMan mans the modules
Abort if the userdata modules failed to load so this doesn't screw us at some point later
@MaximDude
Pop the console open if the specified single module to load failed to…
4bd9404
… load
Also check that it's not userdata
@MaximDude
Store loaded modules less stupidly
3c375a5
@MaximDude
Don't care about official module count - container is unsorted, just …
ca30a46
…check the module's type
@MaximDude
My diff is a clusterfuck and I have a stack overflow AAAAAAAAAAAAAAAA…
8df894c
…AAAAAAAAAAAA
@MaximDude
Don't store module ID ContentFile was loaded from - get it from path …
bfa9498
…on demand
Demand is literally in one place when texturizing terrain
Fixes my stack overflow lel AAAAAAAAAAAAAAAAAAAAAAAAA
@MaximDude
Call ModuleMan instead of PresetMan where necessary (followup tocort…
fcccdd6
…ex-command-community/Cortex-Command-Community-Project-Source@5f75ded)
@MaximDude
Refactor all the ModuleMan things and last bit of unclusterfucking (f…
64f97ed
…ollowup to 5f75ded)
@Causeless

Causeless commented Aug 17, 2024

Copy link
Copy Markdown
ContributorAuthor

Before merging this I want to potentially look at making some of the changes deprecated instead of entirely breaking (or at least adding support to Trez's tool to automatically update this), and also investigate why GetOfficialModuleCount was removed.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@Causeless@MaximDude@traunts@HeliumAnt