TheCloud/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2025-09-18 00:59:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

LWJGL 3: debug add LWJGL3 classpath

Browse Source
This commit is contained in:
khanhduytran0 2020-07-31 09:23:49 +07:00
parent e8bbe7ae68
commit 5494ed6b86
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/net/kdt/pojavlaunch/JMinecraftVersionList.java
View File

@ -13,7 +13,7 @@ public class JMinecraftVersionList {
public Version[] versions; public Version[] versions;
public static class Version { public static class Version {
// Since 1.13 // Since 1.13, so it's one of ways to check
public Arguments arguments; public Arguments arguments;
public String assets; public String assets;

18
app/src/main/java/net/kdt/pojavlaunch/Tools.java
View File

@ -79,7 +79,7 @@ public final class Tools
public static String generate(String version) throws IOException public static String generate(String version) throws IOException
{ {
StringBuilder libStr = new StringBuilder(); //versnDir + "/" + version + "/" + version + ".jar:"; StringBuilder libStr = new StringBuilder(); //versnDir + "/" + version + "/" + version + ".jar:";
String[] classpath = generateLibClasspath(getVersionInfo(version).libraries); String[] classpath = generateLibClasspath(getVersionInfo(version));
if (isClientFirst) { if (isClientFirst) {
libStr.append(getPatchedFile(version)); libStr.append(getPatchedFile(version));
@ -296,10 +296,20 @@ public final class Tools
} }
} }
*/ */
public static String[] generateLibClasspath(DependentLibrary[] libs) public static String[] generateLibClasspath(JMinecraftVersionList.Version info) {
{
List<String> libDir = new ArrayList<String>(); List<String> libDir = new ArrayList<String>();
for (DependentLibrary libItem: libs) {
// Debug: LWJGL 3 override
File lwjgl3Folder = new File(Tools.MAIN_PATH, "lwjgl3");
if (info.arguments != null && lwjgl3Folder.exists()) {
for (File file: lwjgl3Folder.listFiles()) {
if (file.getName().endsWith(".jar")) {
libDir.add(file.getAbsolutePath());
}
}
}
for (DependentLibrary libItem: info.libraries) {
String[] libInfos = libItem.name.split(":"); String[] libInfos = libItem.name.split(":");
libDir.add(Tools.libraries + "/" + Tools.artifactToPath(libInfos[0], libInfos[1], libInfos[2])); libDir.add(Tools.libraries + "/" + Tools.artifactToPath(libInfos[0], libInfos[1], libInfos[2]));
} }