Fix modded client library priority

Removed ancient(v2) parameter: optifineLib

Wrap invokeAfterJITEnabled's handler in main_queue for a more clean
stack
This commit is contained in:
Duy Tran Khanh committed 2023-01-07 21:33:49 +07:00
1 parent ab597ba745
commit 61929eb9ad
3 files changed
+5 -9

No files matched your search

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