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

Force project-based file storage

Browse Source
This commit is contained in:
Juuxel
2020-07-27 23:40:24 +03:00
parent a771c882e5
commit ab01d8c989
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -392,4 +392,8 @@ public class LoomGradleExtension {
public boolean isShareCaches() {
return shareCaches;
}
public boolean isProjectBasedJarStorageForced() {
return true;
}
}

2
src/main/java/net/fabricmc/loom/providers/MappingsProvider.java
View File

@@ -143,7 +143,7 @@ public class MappingsProvider extends DependencyProvider {
JarProcessorManager processorManager = new JarProcessorManager(getProject());
getExtension().setJarProcessorManager(processorManager);
if (processorManager.active()) {
if (processorManager.active() || getExtension().isProjectBasedJarStorageForced()) {
mappedProvider = new MinecraftProcessedProvider(getProject(), processorManager);
getProject().getLogger().lifecycle("Using project based jar storage");
} else {

7
src/main/java/net/fabricmc/loom/providers/MinecraftMappedProvider.java
View File

@@ -147,9 +147,8 @@ public class MinecraftMappedProvider extends DependencyProvider {
public void initFiles(MinecraftProvider minecraftProvider, MappingsProvider mappingsProvider) {
this.minecraftProvider = minecraftProvider;
PatchProvider patchProvider = getExtension().getPatchProvider();
minecraftIntermediaryJar = new File(getExtension().getProjectPersistentCache(), "minecraft-" + getJarVersionString("intermediary") + "-patched-" + patchProvider.forgeVersion + ".jar");
minecraftMappedJar = new File(getJarDirectory(getExtension().getProjectPersistentCache(), "mapped"), "minecraft-" + getJarVersionString("mapped") + "-patched-" + patchProvider.forgeVersion + ".jar");
minecraftIntermediaryJar = new File(getExtension().getProjectPersistentCache(), "minecraft-" + getJarVersionString("intermediary") + ".jar");
minecraftMappedJar = new File(getJarDirectory(getExtension().getProjectPersistentCache(), "mapped"), "minecraft-" + getJarVersionString("mapped") + ".jar");
}
protected File getJarDirectory(File parentDirectory, String type) {
@@ -157,7 +156,7 @@ public class MinecraftMappedProvider extends DependencyProvider {
}
protected String getJarVersionString(String type) {
return String.format("%s-%s-%s-%s", minecraftProvider.getMinecraftVersion(), type, getExtension().getMappingsProvider().mappingsName, getExtension().getMappingsProvider().mappingsVersion);
return String.format("%s-%s-%s-%s-patched-%s", minecraftProvider.getMinecraftVersion(), type, getExtension().getMappingsProvider().mappingsName, getExtension().getMappingsProvider().mappingsVersion, getExtension().getPatchProvider().forgeVersion);
}
public Collection<File> getMapperPaths() {