PojavLauncherTeam/PojavLauncher_iOS
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More fixes

Browse Source
This commit is contained in:
khanhduytran0 committed 2021-02-02 07:20:03 +07:00
1 parent 2c38af09e6
commit 960b1c9a9d
1 file changed
+119 -121
Download Patch File Download Diff File Expand all files Collapse all files
JavaApp/src/main/java/net/kdt/pojavlaunch/PLaunchApp.java
+119 -121
View File
@@ -26,10 +26,10 @@ public class PLaunchApp {
if (!new File(mcDir, "config_ver.txt").exists()) {
Tools.write(mcDir.getAbsolutePath() + "/config_ver.txt", "1.16.5");
}
} catch (Throwable th) {
th.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
}
if (args[0].startsWith("/Applications/")) {
System.out.println("We are on java now! Starting UI...");
UIKit.launchUI(args);
@@ -45,7 +45,7 @@ public class PLaunchApp {
public static void launchMinecraft() {
System.out.println("Saving GLES context");
JREUtils.saveGLContext();
System.out.println("Launching Minecraft " + mVersion.id);
try {
Tools.launchMinecraft(mAccount, mVersion);
@@ -53,132 +53,130 @@ public class PLaunchApp {
throw new RuntimeException(th);
}
}
public static void installMinecraft() {
new Thread(() -> {
currProgress = 0;
maxProgress = 0;
UIKit.updateProgressSafe(0, "Finding a version");
String mcver = "1.16.5";
try {
mcver = Tools.read(Tools.DIR_GAME_NEW + "/config_ver.txt");
} catch (IOException e) {
UIKit.updateProgressSafe(0, "config_ver.txt not found, defaulting to Minecraft 1.16.5");
}
UIKit.updateProgressSafe(0, "Selected Minecraft version: " + mcver);
try {
Thread.sleep(1000);
} catch (InterruptedException e) {}
// dummy account
MinecraftAccount acc = new MinecraftAccount();
acc.selectedVersion = mcver;
new File(Tools.DIR_HOME_VERSION + "/" + mcver).mkdirs();
JMinecraftVersionList.Version verInfo = null;
try {
final String downVName = "/" + mcver + "/" + mcver;
String minecraftMainJar = Tools.DIR_HOME_VERSION + downVName + ".jar";
String verJsonDir = Tools.DIR_HOME_VERSION + downVName + ".json";
JAssets assets = null;
UIKit.updateProgressSafe(0, "Downloading version list");
mVersionList = Tools.GLOBAL_GSON.fromJson(DownloadUtils.downloadString("https://launchermeta.mojang.com/mc/game/version_manifest.json"), JMinecraftVersionList.class);
verInfo = findVersion(mcver);
if (verInfo.url != null && !new File(verJsonDir).exists()) {
UIKit.updateProgressSafe(0, "Downloading " + mcver + ".json");
Tools.downloadFile(verInfo.url, verJsonDir);
}
verInfo = Tools.getVersionInfo(mcver);
currProgress = 0;
maxProgress = 0;
UIKit.updateProgressSafe(0, "Finding a version");
String mcver = "1.16.5";
try {
UIKit.updateProgressSafe(0, "Downloading " + mcver + ".json assets info");
assets = downloadIndex(verInfo.assets, new File(Tools.ASSETS_PATH, "indexes/" + verInfo.assets + ".json"));
mcver = Tools.read(Tools.DIR_GAME_NEW + "/config_ver.txt");
} catch (IOException e) {
UIKit.updateProgressSafe(0, "Error: " + e.getMessage());
e.printStackTrace();
UIKit.updateProgressSafe(0, "config_ver.txt not found, defaulting to Minecraft 1.16.5");
}
maxProgress = verInfo.libraries.length + 1 + (assets == null ? 0 : assets.objects.size());
File outLib;
String libPathURL;
for (final DependentLibrary libItem : verInfo.libraries) {
if (
libItem.name.startsWith("net.java.jinput") ||
libItem.name.startsWith("org.lwjgl")
) { // Black list
currProgress++;
UIKit.updateProgressSafe(currProgress / maxProgress, "Ignored " + libItem.name);
// Thread.sleep(100);
} else {
String[] libInfo = libItem.name.split(":");
String libArtifact = Tools.artifactToPath(libInfo[0], libInfo[1], libInfo[2]);
outLib = new File(Tools.DIR_HOME_LIBRARY + "/" + libArtifact);
outLib.getParentFile().mkdirs();
if (!outLib.exists()) {
UIKit.updateProgressSafe(0, "Selected Minecraft version: " + mcver);
try {
Thread.sleep(1000);
} catch (InterruptedException e) {}
// dummy account
MinecraftAccount acc = new MinecraftAccount();
acc.selectedVersion = mcver;
new File(Tools.DIR_HOME_VERSION + "/" + mcver).mkdirs();
JMinecraftVersionList.Version verInfo = null;
try {
final String downVName = "/" + mcver + "/" + mcver;
String minecraftMainJar = Tools.DIR_HOME_VERSION + downVName + ".jar";
String verJsonDir = Tools.DIR_HOME_VERSION + downVName + ".json";
JAssets assets = null;
UIKit.updateProgressSafe(0, "Downloading version list");
mVersionList = Tools.GLOBAL_GSON.fromJson(DownloadUtils.downloadString("https://launchermeta.mojang.com/mc/game/version_manifest.json"), JMinecraftVersionList.class);
verInfo = findVersion(mcver);
if (verInfo.url != null && !new File(verJsonDir).exists()) {
UIKit.updateProgressSafe(0, "Downloading " + mcver + ".json");
Tools.downloadFile(verInfo.url, verJsonDir);
}
verInfo = Tools.getVersionInfo(mcver);
try {
UIKit.updateProgressSafe(0, "Downloading " + mcver + ".json assets info");
assets = downloadIndex(verInfo.assets, new File(Tools.ASSETS_PATH, "indexes/" + verInfo.assets + ".json"));
} catch (IOException e) {
UIKit.updateProgressSafe(0, "Error: " + e.getMessage());
e.printStackTrace();
}
maxProgress = verInfo.libraries.length + 1 + (assets == null ? 0 : assets.objects.size());
File outLib;
String libPathURL;
for (final DependentLibrary libItem : verInfo.libraries) {
if (
libItem.name.startsWith("net.java.jinput") ||
libItem.name.startsWith("org.lwjgl")
) { // Black list
currProgress++;
UIKit.updateProgressSafe(currProgress / maxProgress, "Downloading " + libItem.name);
UIKit.updateProgressSafe(currProgress / maxProgress, "Ignored " + libItem.name);
// Thread.sleep(100);
} else {
String[] libInfo = libItem.name.split(":");
String libArtifact = Tools.artifactToPath(libInfo[0], libInfo[1], libInfo[2]);
outLib = new File(Tools.DIR_HOME_LIBRARY + "/" + libArtifact);
outLib.getParentFile().mkdirs();
boolean skipIfFailed = false;
if (!outLib.exists()) {
currProgress++;
UIKit.updateProgressSafe(currProgress / maxProgress, "Downloading " + libItem.name);
if (libItem.downloads == null || libItem.downloads.artifact == null) {
MinecraftLibraryArtifact artifact = new MinecraftLibraryArtifact();
artifact.url = (libItem.url == null ? "https://libraries.minecraft.net/" : libItem.url) + libArtifact;
libItem.downloads = new DependentLibrary.LibraryDownloads(artifact);
if (libItem.downloads == null || libItem.downloads.artifact == null) {
MinecraftLibraryArtifact artifact = new MinecraftLibraryArtifact();
artifact.url = (libItem.url == null ? "https://libraries.minecraft.net/" : libItem.url) + libArtifact;
libItem.downloads = new DependentLibrary.LibraryDownloads(artifact);
skipIfFailed = true;
}
try {
libPathURL = libItem.downloads.artifact.url;
Tools.downloadFile(libPathURL, outLib.getAbsolutePath());
} catch (Throwable th) {
th.printStackTrace();
UIKit.updateProgressSafe(currProgress / maxProgress, "Download failed");
skipIfFailed = true;
}
try {
libPathURL = libItem.downloads.artifact.url;
Tools.downloadFile(libPathURL, outLib.getAbsolutePath());
} catch (Throwable th) {
th.printStackTrace();
UIKit.updateProgressSafe(currProgress / maxProgress, "Download failed");
}
}
}
}
currProgress++;
UIKit.updateProgressSafe(currProgress / maxProgress, "Downloading " + mcver + ".jar");
File minecraftMainFile = new File(minecraftMainJar);
if (!minecraftMainFile.exists() || minecraftMainFile.length() == 0l) {
Tools.downloadFile(verInfo.downloads.values().toArray(new MinecraftClientInfo[0])[0].url, minecraftMainJar);
}
if (assets != null) {
mIsAssetsProcessing = true;
downloadAssets(assets, verInfo.assets, assets.map_to_resources ? new File(Tools.OBSOLETE_RESOURCES_PATH) : new File(Tools.ASSETS_PATH));
}
// TODO download assets
} catch (IOException e) {
UIKit.updateProgressSafe(currProgress / maxProgress, "Download error, skipping");
e.printStackTrace();
}
currProgress++;
UIKit.updateProgressSafe(currProgress / maxProgress, "Downloading " + mcver + ".jar");
File minecraftMainFile = new File(minecraftMainJar);
if (!minecraftMainFile.exists() || minecraftMainFile.length() == 0l) {
Tools.downloadFile(verInfo.downloads.values().toArray(new MinecraftClientInfo[0])[0].url, minecraftMainJar);
}
if (assets != null) {
mIsAssetsProcessing = true;
downloadAssets(assets, verInfo.assets, assets.map_to_resources ? new File(Tools.OBSOLETE_RESOURCES_PATH) : new File(Tools.ASSETS_PATH));
}
// TODO download assets
} catch (IOException e) {
UIKit.updateProgressSafe(currProgress / maxProgress, "Download error, skipping");
e.printStackTrace();
}
mAccount = acc;
mVersion = verInfo;
UIKit.launchMinecraftSurface();
mAccount = acc;
mVersion = verInfo;
UIKit.launchMinecraftSurface();
}).start();
}
public static void downloadAssets(JAssets assets, String assetsVersion, File outputDir) throws IOException, Throwable {
public static void downloadAssets(JAssets assets, String assetsVersion, File outputDir) throws IOException {
File hasDownloadedFile = new File(outputDir, "downloaded/" + assetsVersion + ".downloaded");
if (!hasDownloadedFile.exists()) {
System.out.println("Assets begin time: " + System.currentTimeMillis());
@@ -189,7 +187,7 @@ public class PLaunchApp {
if (!mIsAssetsProcessing) {
return;
}
currProgress++;
UIKit.updateProgressSafe(currProgress / maxProgress, "Downloading " + assetsObjects.keySet().toArray(new String[0])[downloadedSs]);
if(!assets.map_to_resources) downloadAsset(asset, objectsDir);
@@ -201,11 +199,11 @@ public class PLaunchApp {
System.out.println("Assets end time: " + System.currentTimeMillis());
}
}
public static final String MINECRAFT_RES = "https://resources.download.minecraft.net/";
public static JAssets downloadIndex(String versionName, File output) throws Throwable {
public static JAssets downloadIndex(String versionName, File output) throws IOException {
if (!output.exists()) {
output.getParentFile().mkdirs();
DownloadUtils.downloadFile(mVersion.assetIndex != null ? mVersion.assetIndex.url : "https://s3.amazonaws.com/Minecraft.Download/indexes/" + versionName + ".json", output);
@@ -214,21 +212,21 @@ public class PLaunchApp {
return Tools.GLOBAL_GSON.fromJson(Tools.read(output.getAbsolutePath()), JAssets.class);
}
public static void downloadAsset(JAssetInfo asset, File objectsDir) throws IOException, Throwable {
public static void downloadAsset(JAssetInfo asset, File objectsDir) throws IOException {
String assetPath = asset.hash.substring(0, 2) + "/" + asset.hash;
File outFile = new File(objectsDir, assetPath);
if (!outFile.exists()) {
DownloadUtils.downloadFile(MINECRAFT_RES + assetPath, outFile);
}
}
public static void downloadAssetMapped(JAssetInfo asset, String assetName, File resDir) throws Throwable {
public static void downloadAssetMapped(JAssetInfo asset, String assetName, File resDir) throws IOException {
String assetPath = asset.hash.substring(0, 2) + "/" + asset.hash;
File outFile = new File(resDir,"/"+assetName);
if (!outFile.exists()) {
DownloadUtils.downloadFile(MINECRAFT_RES + assetPath, outFile);
}
}
private static JMinecraftVersionList.Version findVersion(String version) {
if (mVersionList != null) {
for (JMinecraftVersionList.Version valueVer: mVersionList.versions) {