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

Binary file not shown.

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);

View file

@ -321,10 +321,11 @@ public class PojavLoginActivity extends AppCompatActivity
mkdirs(Tools.mpProfiles);
mkdirs(Tools.MAIN_PATH);
mkdirs(Tools.CTRLMAP_PATH);
mkdirs(Tools.MAIN_PATH + "/lwjgl3");
mkdirs(Tools.MAIN_PATH + "/mods");
mkdirs(Tools.CTRLMAP_PATH);
try {
new CustomControls(this).save(Tools.CTRLDEF_FILE);
@ -334,6 +335,8 @@ public class PojavLoginActivity extends AppCompatActivity
// 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");
//FileAccess.copyAssetToFolderIfNonExist(this, "1.7.3.jar", Tools.versnDir + "/1.7.3");

View file

@ -104,9 +104,16 @@ 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) {

View file

@ -123,7 +123,7 @@
<Spinner
android:layout_width="match_parent"
android:layout_height="40dp"
android:id="@+id/launcherMainSelectVersion"/>
android:id="@+id/launchermain_spinner_version"/>
</LinearLayout>