TheCloud/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2025-09-19 09:39:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update the version list to support some custom versions

Browse Source
This commit is contained in:
ArtDev 2021-01-31 20:53:25 +03:00
parent baf474c9f2
commit 73858f8ec4
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
View File

@ -891,7 +891,7 @@ public class BaseMainActivity extends LoggableActivity {
// appendlnToLog("Info: Custom Java arguments: \"" + LauncherPreferences.PREF_CUSTOM_JAVA_ARGS + "\""); // appendlnToLog("Info: Custom Java arguments: \"" + LauncherPreferences.PREF_CUSTOM_JAVA_ARGS + "\"");
JREUtils.redirectAndPrintJRELog(this, mProfile.accessToken); JREUtils.redirectAndPrintJRELog(this, mProfile.accessToken);
Tools.launchMinecraft(this, mProfile, mVersionInfo); Tools.launchMinecraft(this, mProfile, mProfile.selectedVersion);
} }
private void checkJavaArgsIsLaunchable(String jreVersion) throws Throwable { private void checkJavaArgsIsLaunchable(String jreVersion) throws Throwable {

13
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java
View File

@ -61,12 +61,13 @@ public final class Tools
public static final String LIBNAME_OPTIFINE = "optifine:OptiFine"; public static final String LIBNAME_OPTIFINE = "optifine:OptiFine";
public static void launchMinecraft(final LoggableActivity ctx, MinecraftAccount profile, JMinecraftVersionList.Version versionInfo) throws Throwable { 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); String[] launchArgs = getMinecraftArgs(profile, versionInfo);
// ctx.appendlnToLog("Minecraft Args: " + Arrays.toString(launchArgs)); // ctx.appendlnToLog("Minecraft Args: " + Arrays.toString(launchArgs));
String launchClassPath = generateLaunchClassPath(versionInfo); String launchClassPath = generateLaunchClassPath(versionName);
List<String> javaArgList = new ArrayList<String>(); List<String> javaArgList = new ArrayList<String>();
@ -274,10 +275,10 @@ public final class Tools
} }
private static boolean isClientFirst = false; private static boolean isClientFirst = false;
public static String generateLaunchClassPath(JMinecraftVersionList.Version info) { public static String generateLaunchClassPath(String info) {
StringBuilder libStr = new StringBuilder(); //versnDir + "/" + version + "/" + version + ".jar:"; StringBuilder libStr = new StringBuilder(); //versnDir + "/" + version + "/" + version + ".jar:";
String[] classpath = generateLibClasspath(info); String[] classpath = generateLibClasspath(Tools.getVersionInfo(null,info));
// Debug: LWJGL 3 override // Debug: LWJGL 3 override
// File lwjgl2Folder = new File(Tools.MAIN_PATH, "lwjgl2"); // File lwjgl2Folder = new File(Tools.MAIN_PATH, "lwjgl2");
@ -300,7 +301,7 @@ public final class Tools
*/ */
if (isClientFirst) { if (isClientFirst) {
libStr.append(getPatchedFile(info.id)); libStr.append(getPatchedFile(info));
} }
for (String perJar : classpath) { for (String perJar : classpath) {
if (!new File(perJar).exists()) { if (!new File(perJar).exists()) {
@ -310,7 +311,7 @@ public final class Tools
libStr.append((isClientFirst ? ":" : "") + perJar + (!isClientFirst ? ":" : "")); libStr.append((isClientFirst ? ":" : "") + perJar + (!isClientFirst ? ":" : ""));
} }
if (!isClientFirst) { if (!isClientFirst) {
libStr.append(getPatchedFile(info.id)); libStr.append(getPatchedFile(info));
} }
return libStr.toString(); return libStr.toString();