Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mac path changes #1338

Closed
wants to merge 2 commits into from
Closed

Mac path changes #1338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3032e2
Mac fixes
gchpaco May 17, 2022
dc2eb5e
Fix build errors
gchpaco May 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions public/electron.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,7 @@ ipcMain.handle('installUpdateAndQuitOrRestart', async (e, quitAfterInstall) => {

await fs.writeFile(
path.join(tempFolder, updaterVbs),
`Set WshShell = CreateObject("WScript.Shell")
`Set WshShell = CreateObject("WScript.Shell")
WshShell.Run chr(34) & "${path.join(
tempFolder,
updaterBat
Expand All @@ -702,7 +702,6 @@ ipcMain.handle('installUpdateAndQuitOrRestart', async (e, quitAfterInstall) => {
const updateSpawn = spawn(path.join(tempFolder, updaterVbs), {
cwd: path.dirname(app.getPath('exe')),
detached: true,
shell: true,
stdio: [
'ignore' /* stdin */,
'ignore' /* stdout */,
Expand Down
43 changes: 23 additions & 20 deletions src/app/desktop/utils/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,8 +500,8 @@ export const getJVMArguments112 = (
args.push(`-Xmx${memory}m`);
args.push(`-Xms${memory}m`);
args.push(...jvmOptions);
args.push(`-Djava.library.path="${path.join(instancePath, 'natives')}"`);
args.push(`-Dminecraft.applet.TargetDirectory="${instancePath}"`);
args.push(`-Djava.library.path=${path.join(instancePath, 'natives')}`);
args.push(`-Dminecraft.applet.TargetDirectory=${instancePath}`);
if (mcJson.logging) {
args.push(mcJson?.logging?.client?.argument || '');
}
Expand Down Expand Up @@ -593,7 +593,7 @@ export const getJVMArguments113 = (

args.push(`-Xmx${memory}m`);
args.push(`-Xms${memory}m`);
args.push(`-Dminecraft.applet.TargetDirectory="${instancePath}"`);
args.push(`-Dminecraft.applet.TargetDirectory=${instancePath}`);
if (mcJson.logging) {
args.push(mcJson?.logging?.client?.argument || '');
}
Expand All @@ -611,9 +611,9 @@ export const getJVMArguments113 = (
for (let i = 0; i < args.length; i += 1) {
if (typeof args[i] === 'object' && args[i].rules) {
if (typeof args[i].value === 'string') {
args[i] = `"${args[i].value}"`;
args[i] = args[i].value;
} else if (typeof args[i].value === 'object') {
args.splice(i, 1, ...args[i].value.map(v => `"${v}"`));
args.splice(i, 1, ...args[i].value.map(v => v.toString()));
}
i -= 1;
} else if (typeof args[i] === 'string') {
Expand All @@ -628,10 +628,10 @@ export const getJVMArguments113 = (
val = mcJson.id;
break;
case 'game_directory':
val = `"${instancePath}"`;
val = instancePath;
break;
case 'assets_root':
val = `"${assetsPath}"`;
val = assetsPath;
break;
case 'assets_index_name':
val = mcJson.assets;
Expand All @@ -657,7 +657,7 @@ export const getJVMArguments113 = (
case 'natives_directory':
val = args[i].replace(
argDiscovery,
`"${path.join(instancePath, 'natives')}"`
path.join(instancePath, 'natives')
);
break;
case 'launcher_name':
Expand All @@ -669,7 +669,7 @@ export const getJVMArguments113 = (
case 'classpath':
val = [...libraries, mcjar]
.filter(l => !l.natives)
.map(l => `"${l.path}"`)
.map(l => l.path)
.join(process.platform === 'win32' ? ';' : ':');
break;
default:
Expand All @@ -683,8 +683,10 @@ export const getJVMArguments113 = (
}

if (resolution) {
args.push(`--width ${resolution.width}`);
args.push(`--height ${resolution.height}`);
args.push('--width');
args.push(resolution.width.toString());
args.push('--height');
args.push(resolution.height.toString());
}

args = args.filter(arg => {
Expand Down Expand Up @@ -730,11 +732,11 @@ export const patchForge113 = async (
// Fix forge madness
return arg
.replace('{SIDE}', `client`)
.replace('{ROOT}', `"${path.dirname(installerPath)}"`)
.replace('{MINECRAFT_JAR}', `"${mainJar}"`)
.replace('{MINECRAFT_VERSION}', `"${mcJsonPath}"`)
.replace('{INSTALLER}', `"${installerPath}"`)
.replace('{LIBRARY_DIR}', `"${librariesPath}"`);
.replace('{ROOT}', path.dirname(installerPath))
.replace('{MINECRAFT_JAR}', mainJar)
.replace('{MINECRAFT_VERSION}', mcJsonPath)
.replace('{INSTALLER}', installerPath)
.replace('{LIBRARY_DIR}', librariesPath);
};
const computePathIfPossible = arg => {
if (arg[0] === '[') {
Expand Down Expand Up @@ -766,16 +768,17 @@ export const patchForge113 = async (
const mainClass = await readJarManifest(filePath, 'Main-Class');

await new Promise(resolve => {
/* eslint-disable prettier/prettier */
const ps = spawn(
`"${javaPath}"`,
javaPath,
[
'-classpath',
[`"${filePath}"`, ...classPaths].join(path.delimiter),
[filePath, ...classPaths].join(path.delimiter),
mainClass,
...args
],
{ shell: true }
]
);
/* eslint-enable prettier/prettier */

ps.stdout.on('data', data => {
console.log(data.toString());
Expand Down
11 changes: 5 additions & 6 deletions src/common/reducers/actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2874,7 +2874,7 @@ export function launchInstance(instanceName, forceQuit = false) {
.replace(/\${version_name}/g, mcJson.id)
.replace(
/=\${library_directory}/g,
`="${_getLibrariesPath(state)}"`
`=${_getLibrariesPath(state)}`
)
.replace(
/\${library_directory}/g,
Expand Down Expand Up @@ -2998,12 +2998,12 @@ export function launchInstance(instanceName, forceQuit = false) {
gameResolution,
true,
javaArguments
).join(' ')}`
).join('\n')}`
.replace(...replaceRegex)
.replace(
// eslint-disable-next-line no-template-curly-in-string
'-Dlog4j.configurationFile=${path}',
`-Dlog4j.configurationFile="${loggingPath}"`
`-Dlog4j.configurationFile=${loggingPath}`
)
);

Expand All @@ -3014,7 +3014,7 @@ export function launchInstance(instanceName, forceQuit = false) {
let closed = false;

const ps = spawn(
`"${javaPath}"`,
javaPath,
jvmArguments.map(v =>
v
.toString()
Expand All @@ -3026,8 +3026,7 @@ export function launchInstance(instanceName, forceQuit = false) {
)
),
{
cwd: instancePath,
shell: true
cwd: instancePath
}
);

Expand Down