File Structure Changes (FabricMC#462)

* File Structure changes

* Fix checkstyle

* Fix processed jars

* Fix unpick tests

* Resolve reviews

* Fix merge conflicts

Author: shedaniel

src/main/java/net/fabricmc/loom/LoomRepositoryPlugin.java

@@ -73,13 +73,13 @@ private void declareRepositories(RepositoryHandler repositories, LoomFiles files
 
 		repositories.ivy(repo -> {
 			repo.setUrl(files.getUserCache());
-			repo.patternLayout(layout -> layout.artifact("[revision]/[artifact]-[revision](-[classifier])(.[ext])"));
+			repo.patternLayout(layout -> layout.artifact("[revision]/[artifact](-[classifier])(.[ext])"));
 			repo.metadataSources(IvyArtifactRepository.MetadataSources::artifact);
 		});
 
 		repositories.ivy(repo -> {
 			repo.setUrl(files.getRootProjectPersistentCache());
-			repo.patternLayout(layout -> layout.artifact("[revision]/[artifact]-[revision](-[classifier])(.[ext])"));
+			repo.patternLayout(layout -> layout.artifact("[revision]/[artifact](-[classifier])(.[ext])"));
 			repo.metadataSources(IvyArtifactRepository.MetadataSources::artifact);
 		});
 	}

src/main/java/net/fabricmc/loom/build/mixin/AnnotationProcessorInvoker.java

@@ -82,7 +82,7 @@ private void passMixinArguments(T task, SourceSet sourceSet) {
 			LoomGradleExtension loom = LoomGradleExtension.get(project);
 			String refmapName = Objects.requireNonNull(MixinApExtension.getMixinInformationContainer(sourceSet)).refmapNameProvider().get();
 			Map<String, String> args = new HashMap<>() {{
-					put(Constants.MixinArguments.IN_MAP_FILE_NAMED_INTERMEDIARY, loom.getMappingsProvider().tinyMappings.getCanonicalPath());
+					put(Constants.MixinArguments.IN_MAP_FILE_NAMED_INTERMEDIARY, loom.getMappingsProvider().tinyMappings.toFile().getCanonicalPath());
 					put(Constants.MixinArguments.OUT_MAP_FILE_NAMED_INTERMEDIARY, loom.getNextMixinMappings().getCanonicalPath());
 					put(Constants.MixinArguments.OUT_REFMAP_FILE, getRefmapDestination(task, refmapName));
 					put(Constants.MixinArguments.DEFAULT_OBFUSCATION_ENV, "named:intermediary");

src/main/java/net/fabricmc/loom/configuration/DependencyProvider.java

@@ -49,6 +49,7 @@
 
 import net.fabricmc.loom.LoomGradleExtension;
 import net.fabricmc.loom.LoomGradlePlugin;
+import net.fabricmc.loom.configuration.providers.MinecraftProvider;
 import net.fabricmc.loom.extension.LoomFiles;
 
 public abstract class DependencyProvider {
@@ -93,6 +94,10 @@ public LoomFiles getDirectories() {
 		return getExtension().getFiles();
 	}
 
+	public MinecraftProvider getMinecraftProvider() {
+		return getExtension().getMinecraftProvider();
+	}
+
 	public boolean isRefreshDeps() {
 		return LoomGradlePlugin.refreshDeps;
 	}

src/main/java/net/fabricmc/loom/configuration/LoomDependencyManager.java

@@ -139,7 +139,7 @@ public void handleDependencies(Project project) {
 		}
 
 		SourceRemapper sourceRemapper = new SourceRemapper(project, true);
-		String mappingsKey = mappingsProvider.getMappingsKey();
+		String mappingsIdentifier = mappingsProvider.mappingsIdentifier();
 
 		if (extension.getInstallerData() == null) {
 			//If we've not found the installer JSON we've probably skipped remapping Fabric loader, let's go looking
@@ -168,7 +168,7 @@ public void handleDependencies(Project project) {
 			project.getLogger().warn("fabric-installer.json not found in classpath!");
 		}
 
-		ModCompileRemapper.remapDependencies(project, mappingsKey, extension, sourceRemapper);
+		ModCompileRemapper.remapDependencies(project, mappingsIdentifier, extension, sourceRemapper);
 
 		long start = System.currentTimeMillis();
 

src/main/java/net/fabricmc/loom/configuration/processors/MinecraftProcessedProvider.java

@@ -66,11 +66,11 @@ protected void addDependencies(DependencyInfo dependency, Consumer<Runnable> pos
 		}
 
 		getProject().getDependencies().add(Constants.Configurations.MINECRAFT_NAMED,
-				getProject().getDependencies().module("net.minecraft:minecraft:" + getJarVersionString(projectMappedClassifier)));
+				getProject().getDependencies().module("net.minecraft:minecraft-" + projectMappedClassifier + ":" + getMinecraftProvider().minecraftVersion() + "/" + getExtension().getMappingsProvider().mappingsIdentifier()));
 	}
 
 	private void invalidateJars() {
-		File dir = getJarDirectory(getExtension().getFiles().getUserCache(), projectMappedClassifier);
+		File dir = projectMappedJar.getParentFile();
 
 		if (dir.exists()) {
 			getProject().getLogger().warn("Invalidating project jars");
@@ -87,7 +87,8 @@ private void invalidateJars() {
 	public void initFiles(MinecraftProviderImpl minecraftProvider, MappingsProviderImpl mappingsProvider) {
 		super.initFiles(minecraftProvider, mappingsProvider);
 
-		projectMappedJar = new File(getJarDirectory(getExtension().getFiles().getRootProjectPersistentCache(), projectMappedClassifier), "minecraft-" + getJarVersionString(projectMappedClassifier) + ".jar");
+		projectMappedJar = new File(getDirectories().getRootProjectPersistentCache(), getMinecraftProvider().minecraftVersion() + "/"
+				+ getExtension().getMappingsProvider().mappingsIdentifier() + "/minecraft-" + projectMappedClassifier + ".jar");
 	}
 
 	@Override

src/main/java/net/fabricmc/loom/configuration/providers/LaunchProvider.java

@@ -58,8 +58,8 @@ public void provide(DependencyInfo dependency, Consumer<Runnable> postPopulation
 				.property("fabric.remapClasspathFile", getRemapClasspathFile().getAbsolutePath())
 				.property("log4j.configurationFile", getAllLog4JConfigFiles())
 
-				.property("client", "java.library.path", getDirectories().getNativesDirectory(getExtension().getMinecraftProvider()).getAbsolutePath())
-				.property("client", "org.lwjgl.librarypath", getDirectories().getNativesDirectory(getExtension().getMinecraftProvider()).getAbsolutePath())
+				.property("client", "java.library.path", getExtension().getMinecraftProvider().nativesDir().getAbsolutePath())
+				.property("client", "org.lwjgl.librarypath", getExtension().getMinecraftProvider().nativesDir().getAbsolutePath())
 
 				.argument("client", "--assetIndex")
 				.argument("client", getExtension().getMinecraftProvider().getVersionInfo().assetIndex().fabricId(getExtension().getMinecraftProvider().minecraftVersion()))

src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProvider.java

@@ -24,9 +24,21 @@
 
 package net.fabricmc.loom.configuration.providers;
 
+import java.io.File;
+
 import net.fabricmc.loom.configuration.providers.minecraft.MinecraftVersionMeta;
 
 public interface MinecraftProvider {
+	File workingDir();
+
+	boolean hasCustomNatives();
+
+	File nativesDir();
+
+	File dir(String path);
+
+	File file(String path);
+
 	String minecraftVersion();
 
 	MinecraftVersionMeta getVersionInfo();

src/main/java/net/fabricmc/loom/configuration/providers/MinecraftProviderImpl.java

@@ -53,6 +53,7 @@ public class MinecraftProviderImpl extends DependencyProvider implements Minecra
 	private MinecraftVersionMeta versionInfo;
 	private MinecraftLibraryProvider libraryProvider;
 
+	private File workingDir;
 	private File minecraftJson;
 	private File minecraftClientJar;
 	private File minecraftServerJar;
@@ -112,10 +113,12 @@ public void provide(DependencyInfo dependency, Consumer<Runnable> postPopulation
 	}
 
 	private void initFiles() {
-		minecraftJson = new File(getDirectories().getUserCache(), "minecraft-" + minecraftVersion + "-info.json");
-		minecraftClientJar = new File(getDirectories().getUserCache(), "minecraft-" + minecraftVersion + "-client.jar");
-		minecraftServerJar = new File(getDirectories().getUserCache(), "minecraft-" + minecraftVersion + "-server.jar");
-		minecraftMergedJar = new File(getDirectories().getUserCache(), "minecraft-" + minecraftVersion + "-merged.jar");
+		workingDir = new File(getDirectories().getUserCache(), minecraftVersion);
+		workingDir.mkdirs();
+		minecraftJson = file("minecraft-info.json");
+		minecraftClientJar = file("minecraft-client.jar");
+		minecraftServerJar = file("minecraft-server.jar");
+		minecraftMergedJar = file("minecraft-merged.jar");
 		versionManifestJson = new File(getDirectories().getUserCache(), "version_manifest.json");
 		experimentalVersionsJson = new File(getDirectories().getUserCache(), "experimental_version_manifest.json");
 	}
@@ -257,6 +260,37 @@ public File getMergedJar() {
 		return minecraftMergedJar;
 	}
 
+	@Override
+	public File workingDir() {
+		return workingDir;
+	}
+
+	@Override
+	public boolean hasCustomNatives() {
+		return getProject().getProperties().get("fabric.loom.natives.dir") != null;
+	}
+
+	@Override
+	public File nativesDir() {
+		if (hasCustomNatives()) {
+			return new File((String) getProject().property("fabric.loom.natives.dir"));
+		}
+
+		return dir("natives");
+	}
+
+	@Override
+	public File dir(String path) {
+		File dir = file(path);
+		dir.mkdirs();
+		return dir;
+	}
+
+	@Override
+	public File file(String path) {
+		return new File(workingDir(), path);
+	}
+
 	@Override
 	public String minecraftVersion() {
 		return minecraftVersion;

src/main/java/net/fabricmc/loom/configuration/providers/mappings/GradleMappingContext.java

@@ -62,9 +62,7 @@ public MinecraftProvider minecraftProvider() {
 
 	@Override
 	public File workingDirectory(String name) {
-		File tempDir = new File(mappingsProvider().getMappingsDir().toFile(), workingDirName);
-		tempDir.mkdirs();
-		return new File(tempDir, name);
+		return new File(minecraftProvider().dir("layered/working_dir/" + workingDirName), name);
 	}
 
 	@Override

src/main/java/net/fabricmc/loom/configuration/providers/mappings/LayeredMappingsDependency.java

@@ -64,7 +64,7 @@ public LayeredMappingsDependency(MappingContext mappingContext, LayeredMappingSp
 
 	@Override
 	public Set<File> resolve() {
-		Path mappingsDir = mappingContext.mappingsProvider().getMappingsDir();
+		Path mappingsDir = mappingContext.minecraftProvider().dir("layered").toPath();
 		Path mappingsFile = mappingsDir.resolve(String.format("%s.%s-%s.tiny", GROUP, MODULE, getVersion()));
 
 		if (!Files.exists(mappingsFile) || LoomGradlePlugin.refreshDeps) {

src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProvider.java

@@ -28,7 +28,7 @@
 import java.nio.file.Path;
 
 public interface MappingsProvider {
-	Path getMappingsDir();
+	Path mappingsWorkingDir();
 
 	File intermediaryTinyFile();
 }