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

2.1.3 - Backport library priority fix

Browse Source 
Also timezone fix

Co-authored-by: Duy Tran Khanh <[email protected]>
This commit is contained in:
Eilionoir TunnicliffandDuy Tran Khanh committed 2023-01-17 09:30:29 -05:00
1 parent 1161f6d559
commit 544111b825
3 files changed
+5 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

JavaApp/src/main/java/net/kdt/pojavlaunch/JMinecraftVersionList.java
-1
View File
@@ -31,7 +31,6 @@ public class JMinecraftVersionList {
public String mainClass;
public String minecraftArguments;
public int minimumLauncherVersion;
public DependentLibrary optifineLib;
public String releaseTime;
public String time;
public String type;
JavaApp/src/main/java/net/kdt/pojavlaunch/Tools.java
+2 -7
View File
@@ -420,11 +420,6 @@ public final class Tools
public static JMinecraftVersionList.Version getVersionInfo(String versionName) {
try {
JMinecraftVersionList.Version customVer = Tools.GLOBAL_GSON.fromJson(read(DIR_HOME_VERSION + "/" + versionName + "/" + versionName + ".json"), JMinecraftVersionList.Version.class);
for (DependentLibrary lib : customVer.libraries) {
if (lib.name.startsWith(LIBNAME_OPTIFINE)) {
customVer.optifineLib = lib;
}
}
if (customVer.inheritsFrom == null || customVer.inheritsFrom.equals(customVer.id)) {
return customVer;
} else {
@@ -434,7 +429,7 @@ public final class Tools
insertSafety(inheritsVer, customVer,
"assetIndex", "assets", "id",
"mainClass", "minecraftArguments",
"optifineLib", "releaseTime", "time", "type"
"releaseTime", "time", "type"
);
List<DependentLibrary> libList = new ArrayList<DependentLibrary>(Arrays.asList(inheritsVer.libraries));
@@ -455,7 +450,7 @@ public final class Tools
}
}
if (libName != null) libList.add(lib);
if (libName != null) libList.add(0, lib);
}
} finally {
inheritsVer.libraries = libList.toArray(new DependentLibrary[0]);