aboutsummaryrefslogtreecommitdiff
path: root/api/logic
diff options
context:
space:
mode:
authorkb1000 <kaeptmblaubaer1000@gmail.com>2021-01-29 10:18:33 +0100
committerkb1000 <kaeptmblaubaer1000@gmail.com>2021-01-29 10:18:33 +0100
commitdf2b9adc1e53f44a8172dda9f5df431379e792ba (patch)
treec8e435533d8be6b76df33356af03c66351d6ee44 /api/logic
parent02887536f773643313f15442fc82cebf616da54a (diff)
downloadPrismLauncher-df2b9adc1e53f44a8172dda9f5df431379e792ba.tar.gz
PrismLauncher-df2b9adc1e53f44a8172dda9f5df431379e792ba.tar.bz2
PrismLauncher-df2b9adc1e53f44a8172dda9f5df431379e792ba.zip
Fix up 1.7.10 forge versions for Technic platform import by removing -1.7.10 suffix
Diffstat (limited to 'api/logic')
-rw-r--r--api/logic/modplatform/technic/TechnicPackProcessor.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/api/logic/modplatform/technic/TechnicPackProcessor.cpp b/api/logic/modplatform/technic/TechnicPackProcessor.cpp
index 4a8191eb..dcf2c267 100644
--- a/api/logic/modplatform/technic/TechnicPackProcessor.cpp
+++ b/api/logic/modplatform/technic/TechnicPackProcessor.cpp
@@ -176,7 +176,16 @@ void Technic::TechnicPackProcessor::run(SettingsObjectPtr globalSettings, const
if (libraryName.startsWith("net.minecraftforge:forge:") && libraryName.contains('-'))
{
- components->setComponentVersion("net.minecraftforge", libraryName.section('-', 1));
+ QString libraryVersion = libraryName.section(':', 2);
+ if (!libraryVersion.startsWith("1.7.10-"))
+ {
+ 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:"))
{