Upload via GUI (146 Dateien)
This commit is contained in:
+12
-4
@@ -301,10 +301,18 @@ function collectArgs(argList, map) {
|
||||
// führt Vanilla-Version + Loader-Profil zusammen (mainClass + Argumente)
|
||||
function mergeLoader(vj, lp) {
|
||||
const merged = Object.assign({}, vj, { mainClass: lp.mainClass || vj.mainClass });
|
||||
merged.arguments = {
|
||||
jvm: [...((vj.arguments && vj.arguments.jvm) || []), ...((lp.arguments && lp.arguments.jvm) || [])],
|
||||
game: [...((vj.arguments && vj.arguments.game) || []), ...((lp.arguments && lp.arguments.game) || [])],
|
||||
};
|
||||
if (vj.arguments || lp.arguments) {
|
||||
merged.arguments = {
|
||||
jvm: [...((vj.arguments && vj.arguments.jvm) || []), ...((lp.arguments && lp.arguments.jvm) || [])],
|
||||
game: [...((vj.arguments && vj.arguments.game) || []), ...((lp.arguments && lp.arguments.game) || [])],
|
||||
};
|
||||
} else if (lp.minecraftArguments) {
|
||||
// altes Format (< 1.13, z. B. Forge 1.12.2): Die Loader-Fassung enthält die
|
||||
// kompletten Spielargumente samt --tweakClass. Früher entstand hier eine
|
||||
// leere "arguments"-Liste – dann fehlten Klassenpfad (-cp) und Natives im
|
||||
// Startbefehl, und Java fand net.minecraft.launchwrapper.Launch nicht.
|
||||
merged.minecraftArguments = lp.minecraftArguments;
|
||||
}
|
||||
return merged;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user