Upstream/SKCraft-Launcher
1
0
Fork 0
mirror of https://github.com/SKCraft/Launcher.git synced 2025-02-02 23:31:21 +01:00
Code Issues Projects Releases Wiki Activity

Update natives handling to handle architecture-specific native strings

Browse Source 
Fixes #2
This commit is contained in:
Henry Le Grys 2020-12-22 14:14:01 +00:00
parent 5f0b44acd3
commit ca08bbda34
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
launcher/src/main/java/com/skcraft/launcher/model/minecraft/Library.java
View File

@ -10,7 +10,6 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.google.common.base.Joiner; import com.google.common.base.Joiner;
import com.google.common.base.Splitter; import com.google.common.base.Splitter;
import com.skcraft.launcher.util.Environment; import com.skcraft.launcher.util.Environment;
import com.skcraft.launcher.util.Platform;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
@ -48,18 +47,25 @@ public class Library {
return allow; return allow;
} }
public String getNativeString(Platform platform) { public String getNativeString(Environment environment) {
if (getNatives() != null) { if (getNatives() != null) {
switch (platform) { String nativeString;
switch (environment.getPlatform()) {
case LINUX: case LINUX:
return getNatives().get("linux"); nativeString = getNatives().get("linux");
break;
case WINDOWS: case WINDOWS:
return getNatives().get("windows"); nativeString = getNatives().get("windows");
break;
case MAC_OS_X: case MAC_OS_X:
return getNatives().get("osx"); nativeString = getNatives().get("osx");
break;
default: default:
return null; return null;
} }
return nativeString.replace("${arch}", environment.getArchBits());
} else { } else {
return null; return null;
} }
@ -79,7 +85,7 @@ public class Library {
setServerreq(true); // BACKWARDS COMPATIBILITY setServerreq(true); // BACKWARDS COMPATIBILITY
} }
String nativeString = getNativeString(environment.getPlatform()); String nativeString = getNativeString(environment);
if (nativeString != null) { if (nativeString != null) {
if (getDownloads().getClassifiers() == null) { if (getDownloads().getClassifiers() == null) {