From 5e251cdb228a4f39540ca18a6ed3bc2c7e6362aa Mon Sep 17 00:00:00 2001 From: khanhduytran0 Date: Mon, 5 Oct 2020 16:25:09 +0700 Subject: [PATCH] Activate [ClassWrapperMC](https://github.com/khanhduytran0/ClassWrapperMC) --- app/src/main/assets/ClassWrapper.jar | Bin 1754 -> 1751 bytes .../pojavlaunch/PojavLauncherActivity.java | 4 ++-- .../kdt/pojavlaunch/PojavLoginActivity.java | 7 +++++-- .../main/java/net/kdt/pojavlaunch/Tools.java | 7 +++++++ app/src/main/res/layout/launcher_main_v3.xml | 2 +- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/app/src/main/assets/ClassWrapper.jar b/app/src/main/assets/ClassWrapper.jar index 16714ae026fce9b667d3ea20e8adacb6a027abae..9111faee46bec1f89a79455a8dc47de81bd561a4 100644 GIT binary patch delta 1341 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 C;E&t@ diff --git a/app/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java b/app/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java index ca39f583f..d146dfd7b 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java +++ b/app/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java @@ -156,7 +156,7 @@ public class PojavLauncherActivity extends AppCompatActivity ArrayAdapter adapterAcc = new ArrayAdapter(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 adapterVer = new ArrayAdapter(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); diff --git a/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java b/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java index 3d4956090..e7aa513cb 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java +++ b/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java @@ -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"); diff --git a/app/src/main/java/net/kdt/pojavlaunch/Tools.java b/app/src/main/java/net/kdt/pojavlaunch/Tools.java index f6b610266..897631d48 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/Tools.java +++ b/app/src/main/java/net/kdt/pojavlaunch/Tools.java @@ -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) { diff --git a/app/src/main/res/layout/launcher_main_v3.xml b/app/src/main/res/layout/launcher_main_v3.xml index 5ed6120d1..0a894b503 100644 --- a/app/src/main/res/layout/launcher_main_v3.xml +++ b/app/src/main/res/layout/launcher_main_v3.xml @@ -123,7 +123,7 @@ + android:id="@+id/launchermain_spinner_version"/>