Merge remote-tracking branch 'FabricMC/exp/0.10' into dev/future

Signed-off-by: shedaniel <daniel@shedaniel.me>

# Conflicts:
#	src/main/java/net/fabricmc/loom/configuration/LoomDependencyManager.java
#	src/main/java/net/fabricmc/loom/configuration/providers/mappings/GradleMappingContext.java
#	src/main/java/net/fabricmc/loom/configuration/providers/mappings/LayeredMappingsDependency.java
#	src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProviderImpl.java
#	src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftMappedProvider.java
#	src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java

5 files changed, 2 insertions, 40 deletions

diff --git a/src/main/java/net/fabricmc/loom/extension/LoomFiles.java b/src/main/java/net/fabricmc/loom/extension/LoomFiles.java
index c93e0272..66307c18 100644
--- a/src/main/java/net/fabricmc/loom/extension/LoomFiles.java
+++ b/src/main/java/net/fabricmc/loom/extension/LoomFiles.java
@@ -29,8 +29,6 @@ import java.io.File;
 import org.gradle.api.Project;
 import org.gradle.api.initialization.Settings;
 
-import net.fabricmc.loom.configuration.providers.MinecraftProvider;
-
 public interface LoomFiles {
 	static LoomFiles create(Project project) {
 		return new LoomFilesProjectImpl(project);
@@ -46,8 +44,6 @@ public interface LoomFiles {
 	File getProjectBuildCache();
 	File getRemappedModCache();
 	File getNativesJarStore();
-	boolean hasCustomNatives();
-	File getNativesDirectory(MinecraftProvider minecraftProvider);
 	File getDefaultLog4jConfigFile();
 	File getDevLauncherConfig();
 	File getUnpickLoggingConfigFile();
diff --git a/src/main/java/net/fabricmc/loom/extension/LoomFilesProjectImpl.java b/src/main/java/net/fabricmc/loom/extension/LoomFilesProjectImpl.java
index b047dc1f..3a5897e5 100644
--- a/src/main/java/net/fabricmc/loom/extension/LoomFilesProjectImpl.java
+++ b/src/main/java/net/fabricmc/loom/extension/LoomFilesProjectImpl.java
@@ -29,8 +29,6 @@ import java.util.Objects;
 
 import org.gradle.api.Project;
 
-import net.fabricmc.loom.configuration.providers.MinecraftProvider;
-
 public final class LoomFilesProjectImpl extends LoomFilesBaseImpl {
 	private final Project project;
 
@@ -57,24 +55,4 @@ public final class LoomFilesProjectImpl extends LoomFilesBaseImpl {
 	protected File getBuildDir() {
 		return project.getBuildDir();
 	}
-
-	@Override
-	public boolean hasCustomNatives() {
-		return project.getProperties().get("fabric.loom.natives.dir") != null;
-	}
-
-	@Override
-	public File getNativesDirectory(MinecraftProvider minecraftProvider) {
-		if (hasCustomNatives()) {
-			return new File((String) project.property("fabric.loom.natives.dir"));
-		}
-
-		File natives = new File(getUserCache(), "natives/" + minecraftProvider.minecraftVersion());
-
-		if (!natives.exists()) {
-			natives.mkdirs();
-		}
-
-		return natives;
-	}
 }
diff --git a/src/main/java/net/fabricmc/loom/extension/LoomFilesSettingsImpl.java b/src/main/java/net/fabricmc/loom/extension/LoomFilesSettingsImpl.java
index 7e12b0cb..6597ad17 100644
--- a/src/main/java/net/fabricmc/loom/extension/LoomFilesSettingsImpl.java
+++ b/src/main/java/net/fabricmc/loom/extension/LoomFilesSettingsImpl.java
@@ -29,8 +29,6 @@ import java.util.Objects;
 
 import org.gradle.api.initialization.Settings;
 
-import net.fabricmc.loom.configuration.providers.MinecraftProvider;
-
 public class LoomFilesSettingsImpl extends LoomFilesBaseImpl {
 	private final Settings settings;
 
@@ -39,16 +37,6 @@ public class LoomFilesSettingsImpl extends LoomFilesBaseImpl {
 	}
 
 	@Override
-	public boolean hasCustomNatives() {
-		return false;
-	}
-
-	@Override
-	public File getNativesDirectory(MinecraftProvider minecraftProvider) {
-		throw new IllegalStateException("You can not access natives directory from setting stage");
-	}
-
-	@Override
 	protected File getGradleUserHomeDir() {
 		return settings.getGradle().getGradleUserHomeDir();
 	}
diff --git a/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java b/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java
index 6ff2c826..5feeafbe 100644
--- a/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java
+++ b/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java
@@ -166,7 +166,7 @@ public abstract class LoomGradleExtensionApiImpl implements LoomGradleExtensionA
 		LayeredMappingSpecBuilder builder = new LayeredMappingSpecBuilder(this);
 		action.execute(builder);
 		LayeredMappingSpec builtSpec = builder.build();
-		return new LayeredMappingsDependency(new GradleMappingContext(getProject()), builtSpec);
+		return new LayeredMappingsDependency(new GradleMappingContext(getProject(), builtSpec.getVersion().replace("+", "_").replace(".", "_")), builtSpec, builtSpec.getVersion());
 	}
 
 	protected abstract String getMinecraftVersion();
diff --git a/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionImpl.java b/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionImpl.java
index feb6bc21..730d683b 100644
--- a/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionImpl.java
+++ b/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionImpl.java
@@ -81,7 +81,7 @@ public class LoomGradleExtensionImpl extends LoomGradleExtensionApiImpl implemen
 
 	@Override
 	public synchronized File getNextMixinMappings() {
-		File mixinMapping = new File(getFiles().getProjectBuildCache(), "mixin-map-" + getMinecraftProvider().minecraftVersion() + "-" + getMappingsProvider().mappingsVersion + "." + mixinMappings.size() + ".tiny");
+		File mixinMapping = new File(getFiles().getProjectBuildCache(), "mixin-map-" + getMappingsProvider().mappingsIdentifier() + "." + mixinMappings.size() + ".tiny");
 		mixinMappings.add(mixinMapping);
 		return mixinMapping;
 	}