2009Scape/2009Scape-mobile
1
0
Fork 0
mirror of https://github.com/2009scape/2009Scape-mobile.git synced 2025-12-20 13:30:15 -07:00
Code Issues Projects Releases Packages Wiki Activity

PVC first build

Browse source
This commit is contained in:
artdeell 2021-02-13 18:19:23 +03:00
parent bd0d4a2f49
commit 84b4f53a9b
4 changed files with 130 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java
View file

@ -18,6 +18,8 @@ import java.util.zip.*;
import net.kdt.pojavlaunch.prefs.*;
import net.kdt.pojavlaunch.utils.*;
import net.kdt.pojavlaunch.value.*;
import net.kdt.pojavlaunch.value.launcherprofiles.LauncherProfiles;
import org.lwjgl.glfw.*;
import android.view.*;
import android.widget.Toast;
@ -64,7 +66,13 @@ public final class Tools
public static void launchMinecraft(final LoggableActivity ctx, MinecraftAccount profile, String versionName) throws Throwable {
JMinecraftVersionList.Version versionInfo = Tools.getVersionInfo(null,versionName);
String[] launchArgs = getMinecraftArgs(profile, versionInfo);
PerVersionConfig.update();
PerVersionConfig.VersionConfig pvcConfig = PerVersionConfig.configMap.get(versionName);
String gamedirPath;
if(pvcConfig != null && pvcConfig.gamePath != null && !pvcConfig.gamePath.isEmpty()) gamedirPath = pvcConfig.gamePath;
else gamedirPath = Tools.DIR_GAME_NEW;
if(pvcConfig != null && pvcConfig.jvmArgs != null && !pvcConfig.jvmArgs.isEmpty()) LauncherPreferences.PREF_CUSTOM_JAVA_ARGS = pvcConfig.jvmArgs;
String[] launchArgs = getMinecraftArgs(profile, versionInfo, gamedirPath);
// ctx.appendlnToLog("Minecraft Args: " + Arrays.toString(launchArgs));
@ -171,7 +179,7 @@ public final class Tools
javaArgList.addAll(overrideableArgList);
}
public static String[] getMinecraftArgs(MinecraftAccount profile, JMinecraftVersionList.Version versionInfo) {
public static String[] getMinecraftArgs(MinecraftAccount profile, JMinecraftVersionList.Version versionInfo, String strGameDir) {
String username = profile.username;
String versionName = versionInfo.id;
if (versionInfo.inheritsFrom != null) {
@ -180,7 +188,7 @@ public final class Tools
String userType = "mojang";
File gameDir = new File(Tools.DIR_GAME_NEW);
File gameDir = new File(strGameDir);
gameDir.mkdirs();
Map<String, String> varArgMap = new ArrayMap<String, String>();