Merge pull request #1923 from ebkr/develop

Release 3.2.5 (Develop)

Author: ebkr

CHANGELOG.md

@@ -1,3 +1,7 @@
+### 3.2.5
+#### Changes
+- Fixed several bugs causing rendering issues
+
 ### 3.2.4
 #### Games added
 - Hollow Knight: Silksong

package.json

@@ -1,6 +1,6 @@
 {
   "name": "r2modman",
-  "version": "3.2.4",
+  "version": "3.2.5",
   "description": "A simple and easy to use mod manager for many games using Thunderstore.",
   "productName": "r2modman",
   "author": "ebkr",

src/_managerinf/ManagerInformation.ts

@@ -1,7 +1,7 @@
 import VersionNumber from '../model/VersionNumber';
 
 export default class ManagerInformation {
-    public static VERSION: VersionNumber = new VersionNumber('3.2.4');
+    public static VERSION: VersionNumber = new VersionNumber('3.2.5');
     public static IS_PORTABLE: boolean = false;
     public static APP_NAME: string = "r2modman";
 }

src/components/computed/WrapperArguments.ts

@@ -1,5 +1,6 @@
 import {computed} from "vue";
 import path from "../../providers/node/path/path";
 import PathResolver from "../../r2mm/manager/PathResolver";
+import appWindow from '../../providers/node/app/app_window';
 
-export const ComputedWrapperLaunchArguments = computed(() => `"${path.join(PathResolver.MOD_ROOT, process.platform === 'darwin' ? 'macos_proxy' : 'linux_wrapper.sh')}" %command%`);
+export const ComputedWrapperLaunchArguments = computed(() => `"${path.join(PathResolver.MOD_ROOT, appWindow.getPlatform() === 'darwin' ? 'macos_proxy' : 'linux_wrapper.sh')}" %command%`);

src/components/settings-components/SettingsView.vue

@@ -19,6 +19,7 @@ import { State } from '../../store';
 import VueRouter from 'vue-router';
 import {getLaunchType, LaunchType} from "../../model/real_enums/launch/LaunchType";
 import {LaunchTypeModalOpen} from "../../components/modals/launch-type/LaunchTypeRefs";
+import appWindow from '../../providers/node/app/app_window';
 
 const store = getStore<State>();
 let router!: VueRouter;
@@ -342,7 +343,7 @@ onMounted(async () => {
         )
     }
 
-    if (['linux', 'darwin'].includes(process.platform) && activeGame.value.activePlatform.storePlatform === Platform.STEAM) {
+    if (['linux', 'darwin'].includes(appWindow.getPlatform()) && activeGame.value.activePlatform.storePlatform === Platform.STEAM) {
         settingsList.push(
             new SettingsRow(
                 'Debugging',

src/pages/Help.vue

@@ -110,6 +110,7 @@ import {State} from '../store';
 import {getDeterminedLaunchType} from "../utils/LaunchUtils";
 import {ComputedWrapperLaunchArguments} from "../components/computed/WrapperArguments";
 import {getLaunchType, LaunchType} from "../model/real_enums/launch/LaunchType";
+import appWindow from '../providers/node/app/app_window';
 
 const store = getStore<State>();
 
@@ -122,7 +123,7 @@ const launchArgs = ref("");
 watchEffect(async () => {
     const loaderArgs = doorstopTarget.value;
     const prerequisiteText = ComputedWrapperLaunchArguments.value;
-    if (process.platform === 'win32') {
+    if (appWindow.getPlatform() === 'win32') {
         launchArgs.value = loaderArgs;
         return;
     }

src/pages/LinuxNativeGameSetup.vue

@@ -24,12 +24,13 @@ import { State } from '../store';
 import VueRouter, {useRouter} from 'vue-router';
 import {ComputedWrapperLaunchArguments} from "../components/computed/WrapperArguments";
 import InteractionProviderImpl from "../r2mm/system/InteractionProviderImpl";
+import appWindow from '../providers/node/app/app_window';
 
 const store = getStore<State>();
 let router = useRouter();
 
 const activeGame = computed(() => store.state.activeGame.displayName);
-const platformName = computed<string>(() => process.platform === 'darwin' ? 'macOS' : process.platform);
+const platformName = computed<string>(() => appWindow.getPlatform() === 'darwin' ? 'macOS' : appWindow.getPlatform());
 
 function copy(){
     let range = document.createRange();

src/r2mm/launching/instructions/GameInstructionParser.ts

@@ -82,7 +82,7 @@ export default class GameInstructionParser {
 
     private static async bepInExRendererPreloaderPath(game: Game, profile: Profile): Promise<string | R2Error> {
         try {
-            if (['linux'].includes(process.platform.toLowerCase())) {
+            if (['linux'].includes(appWindow.getPlatform().toLowerCase())) {
                 const isProton = await isProtonRequired(game);
                 const corePath = await FsProvider.instance.realpath(profile.joinToProfilePath('BepInEx', 'core'));
                 const preloaderPath = path.join(corePath,

src/r2mm/launching/instructions/instructions/loader/BepisLoaderGameInstructions.ts

@@ -5,13 +5,14 @@ import Profile from '../../../../../model/Profile';
 import FsProvider from '../../../../../providers/generic/file/FsProvider';
 import { DynamicGameInstruction } from '../../DynamicGameInstruction';
 import { GameInstanceType } from '../../../../../model/schema/ThunderstoreSchema';
-import path from 'path';
+import path from '../../../../../providers/node/path/path';
+import appWindow from '../../../../../providers/node/app/app_window';
 
 export default class BepisLoaderGameInstructions extends GameInstructionGenerator {
 
     public async generate(game: Game, profile: Profile): Promise<GameInstruction> {
         let extraArguments = "";
-        if (["linux", "darwin"].includes(process.platform.toLowerCase())) {
+        if (["linux", "darwin"].includes(appWindow.getPlatform().toLowerCase())) {
             extraArguments += ` --r2profile "${DynamicGameInstruction.PROFILE_NAME}"`;
             if (game.instanceType === GameInstanceType.SERVER) {
                 extraArguments += ` --server`;

src/utils/LaunchUtils.ts

@@ -11,6 +11,7 @@ import LinuxGameDirectoryResolver from '../r2mm/manager/linux/GameDirectoryResol
 import {LaunchType} from "../model/real_enums/launch/LaunchType";
 import path from "../providers/node/path/path";
 import PathResolver from "../r2mm/manager/PathResolver";
+import appWindow from '../providers/node/app/app_window';
 
 export enum LaunchMode { VANILLA, MODDED };
 
@@ -71,7 +72,7 @@ export const throwIfNoGameDir = async (game: Game): Promise<void> => {
 };
 
 export async function isProtonRequired(activeGame: Game) {
-    if (process.platform !== 'linux') {
+    if (appWindow.getPlatform() !== 'linux') {
         return false;
     }
     return [Platform.STEAM, Platform.STEAM_DIRECT].includes(activeGame.activePlatform.storePlatform)
@@ -97,5 +98,5 @@ export async function areWrapperArgumentsProvided(game: Game): Promise<boolean>
 }
 
 export async function getWrapperLaunchArgs(): Promise<string> {
-    return `"${path.join(PathResolver.MOD_ROOT, process.platform === 'darwin' ? 'macos_proxy' : 'linux_wrapper.sh')}" %command%`;
+    return `"${path.join(PathResolver.MOD_ROOT, appWindow.getPlatform() === 'darwin' ? 'macos_proxy' : 'linux_wrapper.sh')}" %command%`;
 }