CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3562 from kb-1000/technic-fix-1710-forge

Browse Source 
Fix up 1.7.10 forge versions for Technic platform import by removing -1.7.10 suffix
This commit is contained in:
Petr Mrázek 2021-01-29 13:02:04 +01:00 committed by GitHub
commit 8eee4e3e6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/logic/modplatform/technic/TechnicPackProcessor.cpp
View File

@ -175,9 +175,18 @@ void Technic::TechnicPackProcessor::run(SettingsObjectPtr globalSettings, const
auto libraryName = Json::ensureString(libraryObject, "name", "", ""); auto libraryName = Json::ensureString(libraryObject, "name", "", "");
if (libraryName.startsWith("net.minecraftforge:forge:") && libraryName.contains('-')) if (libraryName.startsWith("net.minecraftforge:forge:") && libraryName.contains('-'))
{
QString libraryVersion = libraryName.section(':', 2);
if (!libraryVersion.startsWith("1.7.10-"))
{ {
components->setComponentVersion("net.minecraftforge", libraryName.section('-', 1)); components->setComponentVersion("net.minecraftforge", libraryName.section('-', 1));
} }
else
{
// 1.7.10 versions sometimes look like 1.7.10-10.13.4.1614-1.7.10, this filters out the 10.13.4.1614 part
components->setComponentVersion("net.minecraftforge", libraryName.section('-', 1, 1));
}
}
else if (libraryName.startsWith("net.minecraftforge:minecraftforge:")) else if (libraryName.startsWith("net.minecraftforge:minecraftforge:"))
{ {
components->setComponentVersion("net.minecraftforge", libraryName.section(':', 2)); components->setComponentVersion("net.minecraftforge", libraryName.section(':', 2));