mirror/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2026-04-22 18:47:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

Activate [ClassWrapperMC](https://github.com/khanhduytran0/ClassWrapperMC)

Browse Source
This commit is contained in:
khanhduytran0
2020-10-05 16:25:09 +07:00
parent 8f12433b8e
commit 5e251cdb22
5 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java
View File

@@ -156,7 +156,7 @@ public class PojavLauncherActivity extends AppCompatActivity
ArrayAdapter<String> adapterAcc = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_item, accountList);
adapterAcc.setDropDownViewResource(android.R.layout.simple_list_item_single_choice);
accountSelector = (Spinner) findViewById(R.id.launcherMainSelectVersion);
accountSelector = (Spinner) findViewById(R.id.launchermain_spinner_account);
accountSelector.setAdapter(adapterAcc);
accountSelector.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener(){
@@ -195,7 +195,7 @@ public class PojavLauncherActivity extends AppCompatActivity
ArrayAdapter<String> adapterVer = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_item, availableVersions);
adapterVer.setDropDownViewResource(android.R.layout.simple_list_item_single_choice);
versionSelector = (Spinner) findViewById(R.id.launcherMainSelectVersion);
versionSelector = (Spinner) findViewById(R.id.launchermain_spinner_version);
versionSelector.setAdapter(adapterVer);
launchProgress = (ProgressBar) findViewById(R.id.progressDownloadBar);

7
app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
View File

@@ -321,10 +321,11 @@ public class PojavLoginActivity extends AppCompatActivity
mkdirs(Tools.mpProfiles);
mkdirs(Tools.MAIN_PATH);
mkdirs(Tools.MAIN_PATH + "/lwjgl3");
mkdirs(Tools.MAIN_PATH + "/mods");
mkdirs(Tools.CTRLMAP_PATH);
mkdirs(Tools.MAIN_PATH + "/mods");
try {
new CustomControls(this).save(Tools.CTRLDEF_FILE);
@@ -333,6 +334,8 @@ public class PojavLoginActivity extends AppCompatActivity
// Extract launcher_profiles.json
// TODO: Remove after implement.
Tools.copyAssetFile(this, "launcher_profiles.json", Tools.MAIN_PATH, false);
Tools.copyAssetFile(this, "ClassWrapper.jar", Tools.MAIN_PATH + "/lwjgl3", false);
// Yep, the codebase from v1.0.3:
//FileAccess.copyAssetToFolderIfNonExist(this, "1.0.jar", Tools.versnDir + "/1.0");

7
app/src/main/java/net/kdt/pojavlaunch/Tools.java
View File

@@ -103,10 +103,17 @@ public final class Tools
getJavaArgs(ctx, javaArgList);
javaArgList.add("-cp");
javaArgList.add(Tools.MAIN_PATH + "/lwjgl3/ClassWrapper.jar");
javaArgList.add(launchClassPath);
javaArgList.add(versionInfo.mainClass);
javaArgList.addAll(Arrays.asList(launchArgs));
/*
javaArgList.add("-cp");
javaArgList.add(launchClassPath);
javaArgList.add(versionInfo.mainClass);
javaArgList.addAll(Arrays.asList(launchArgs));
*/
}
if (LAUNCH_TYPE == LTYPE_PROCESS) {