imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-04-02 13:37:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev/0.5' into forge

Browse Source
This commit is contained in:
Juuxel
2020-12-03 18:10:27 +02:00
parent cb5d373707 dd68c84226
commit 8baa801394
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/net/fabricmc/loom/LoomGradleExtension.java
View File

@@ -247,6 +247,12 @@ public class LoomGradleExtension {
}
public File getNativesDirectory() {
Object customNativesDir = project.getProperties().get("fabric.loom.natives.dir");
if (customNativesDir != null) {
return new File((String) customNativesDir);
}
File natives = new File(getUserCache(), "natives/" + getMinecraftProvider().getMinecraftVersion());
if (!natives.exists()) {
@@ -256,6 +262,10 @@ public class LoomGradleExtension {
return natives;
}
public boolean hasCustomNatives() {
return project.getProperties().get("fabric.loom.natives.dir") != null;
}
public File getDevLauncherConfig() {
return new File(getProjectPersistentCache(), "launch.cfg");
}

8
src/main/java/net/fabricmc/loom/providers/MinecraftNativesProvider.java
View File

@@ -45,6 +45,14 @@ public class MinecraftNativesProvider {
File nativesDir = extension.getNativesDirectory();
File jarStore = extension.getNativesJarStore();
if (extension.hasCustomNatives()) {
if (!nativesDir.exists()) {
throw new RuntimeException("Could no find custom natives directory at " + nativesDir.getAbsolutePath());
}
return;
}
for (MinecraftVersionInfo.Library library : versionInfo.libraries) {
File libJarFile = library.getFile(jarStore);