⏪ Actually, plugins is silly

Author: E1337Kat

src/installer.cet.ts

@@ -67,58 +67,28 @@ const allCanonicalCetFiles = (files: string[]) =>
 const matchCetInitLua = (filePath: string): boolean =>
   path.basename(filePath) === CET_MOD_CANONICAL_INIT_FILE;
 
-const notMatchCetInitLua = (filePath: string): boolean =>
-  path.basename(filePath) !== CET_MOD_CANONICAL_INIT_FILE;
-
 const findCanonicalCetDirs = (fileTree: FileTree): string[] =>
   findDirectSubdirsWithSome(CET_MOD_CANONICAL_PATH_PREFIX, matchCetInitLua, fileTree);
 
-const findPluginCetDirs = (fileTree: FileTree): string[] =>
-  findDirectSubdirsWithSome(CET_MOD_CANONICAL_PATH_PREFIX, notMatchCetInitLua, fileTree);
-
 export const detectCetCanonLayout = (fileTree: FileTree): boolean =>
   // don't worry about correctness so much here. if there is one valid cet mod, that is good enough
   findCanonicalCetDirs(fileTree).length > 0;
 
-export const detectCetPluginLayout = (fileTree: FileTree): boolean =>
-  // don't worry about correctness so much here. if there is one valid cet mod, that is good enough
-  findPluginCetDirs(fileTree).length > 0;
-
-export const cetCanonLayout = (
+export const cetLazyLayout = (
   api: VortexApi,
   _modName: string,
   fileTree: FileTree,
 ): MaybeInstructions => {
-  const allCanonCetFiles = findCanonicalCetDirs(fileTree).flatMap((namedSubdir) =>
-    filesUnder(namedSubdir, Glob.Any, fileTree));
+  const allCetFiles = filesUnder(CET_MOD_CANONICAL_PATH_PREFIX, Glob.Any, fileTree);
 
-  if (allCanonCetFiles.length < 1) {
+  if (allCetFiles.length < 1) {
     api.log(`debug`, `No canonical CET files found.`);
     return NoInstructions.NoMatch;
   }
 
   return {
     kind: CetLayout.Canon,
-    instructions: instructionsForSameSourceAndDestPaths(allCanonCetFiles),
-  };
-};
-
-export const cetPluginLayout = (
-  api: VortexApi,
-  _modName: string,
-  fileTree: FileTree,
-): MaybeInstructions => {
-  const allCanonCetFiles = findPluginCetDirs(fileTree).flatMap((namedSubdir) =>
-    filesUnder(namedSubdir, Glob.Any, fileTree));
-
-  if (allCanonCetFiles.length < 1) {
-    api.log(`debug`, `No plugin CET files found.`);
-    return NoInstructions.NoMatch;
-  }
-
-  return {
-    kind: CetLayout.PluginOnly,
-    instructions: instructionsForSameSourceAndDestPaths(allCanonCetFiles),
+    instructions: instructionsForSameSourceAndDestPaths(allCetFiles),
   };
 };
 

src/installer.multitype.ts

@@ -14,9 +14,7 @@ import {
 } from "./installer.archive";
 import {
   detectCetCanonLayout,
-  cetCanonLayout,
-  detectCetPluginLayout,
-  cetPluginLayout,
+  cetLazyLayout,
 } from "./installer.cet";
 import {
   promptToFallbackOrFailOnUnresolvableLayout,
@@ -89,7 +87,6 @@ export const testForMultiTypeMod: V2077TestFunc = (
   fileTree: FileTree,
 ): Promise<VortexTestResult> => {
   const hasCanonCet = detectCetCanonLayout(fileTree);
-  const hasPluginCet = detectCetPluginLayout(fileTree);
   const hasCanonRed4Ext = detectRed4ExtCanonOnlyLayout(fileTree);
   const hasBasedirRed4Ext = detectRed4ExtBasedirLayout(fileTree);
 
@@ -108,7 +105,6 @@ export const testForMultiTypeMod: V2077TestFunc = (
       hasAllowedConfigJson,
       hasAllowedConfigXml,
       hasCanonCet,
-      hasPluginCet,
       hasAllowedREDmods,
       hasAllowedRedscript,
       hasCanonRed4Ext,
@@ -181,8 +177,7 @@ export const installMultiTypeMod: V2077InstallFunc = async (
   //
   // Defect: https://github.com/E1337Kat/cyberpunk2077_ext_redux/issues/96
   const allInstructionSets: LayoutToInstructions[] = [
-    cetCanonLayout,
-    cetPluginLayout,
+    cetLazyLayout,
     red4extBasedirLayout,
     red4extCanonLayout,
   ];

src/installers.layouts.ts

@@ -486,10 +486,8 @@ export const enum AsiLayout {
 export const enum CetLayout {
   Canon = `
           - .\\bin\\x64\\plugins\\cyber_engine_tweaks\\mods\\[modname]\\init.lua
-          - .\\bin\\x64\\plugins\\cyber_engine_tweaks\\mods\\[modname]\\[any files + subdirs]
-          `,
-  PluginOnly = `
           - .\\bin\\x64\\plugins\\cyber_engine_tweaks\\mods\\[pluginmod]\\[any files + subdirs]
+          - .\\bin\\x64\\plugins\\cyber_engine_tweaks\\mods\\[modname]\\[any files + subdirs]
           `,
 }
 export const CET_GLOBAL_INI = path.normalize(`bin/x64/global.ini`);