0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: support split natives

Browse Source 
Mojang introduced a new structure for natives, notably for LWJGL.
Now instead of using the `natives` structure of the version format, Mojang
chose to create a seperate library entry for each platform, which uses
the `rules` structure to specify the platform. These new split natives
carry the same groupId and artifactId, as the main library, but have an
additional classifier, like `natives-linux`.

When comparing GradleSpecifiers we don't look at the classifier, so when
the launcher sees an artifact called `org.lwjgl:lwjgl:3.3.1` and right
after that an artifact called `org.lwjgl:lwjgl:3.3.1:natives-linux`, it
will treat it as "already added" and forget it.

This change will include the classifier in that comparison.
This commit is contained in:
Sefa Eyeoglu 2022-05-18 22:51:14 +02:00
parent b2878dca1d
commit f66e0fa0e8
No known key found for this signature in database
GPG Key ID: C10411294912A422
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
launcher/minecraft/GradleSpecifier.h
View File

@ -124,7 +124,7 @@ struct GradleSpecifier
} }
bool matchName(const GradleSpecifier & other) const bool matchName(const GradleSpecifier & other) const
{ {
return other.artifactId() == artifactId() && other.groupId() == groupId(); return other.artifactId() == artifactId() && other.groupId() == groupId() && other.classifier() == classifier();
} }
bool operator==(const GradleSpecifier & other) const bool operator==(const GradleSpecifier & other) const
{ {