diff options
| author | shedaniel <daniel@shedaniel.me> | 2022-02-16 13:45:21 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2022-02-16 13:45:21 +0800 |
| commit | d424c83691e22618a2c7b0a1de842c0dcf1a2347 (patch) | |
| tree | 6ea37346c5f4a61cbefb64150e6adc506c47eb00 | |
| parent | b2b0221cb1c0dd539e3009efeb76ccee331ab26b (diff) | |
| parent | 14ffadc40d86263fea462ce43223656084a8b061 (diff) | |
| download | architectury-loom-d424c83691e22618a2c7b0a1de842c0dcf1a2347.tar.gz architectury-loom-d424c83691e22618a2c7b0a1de842c0dcf1a2347.tar.bz2 architectury-loom-d424c83691e22618a2c7b0a1de842c0dcf1a2347.zip | |
Merge remote-tracking branch 'FabricMC/dev/0.10' into dev/0.10.0
| -rw-r--r-- | src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProviderImpl.java | 2 | ||||
| -rw-r--r-- | src/main/java/net/fabricmc/loom/task/ValidateAccessWidenerTask.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProviderImpl.java b/src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProviderImpl.java index 23bf71c8..401d07be 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProviderImpl.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProviderImpl.java @@ -275,7 +275,7 @@ public class MappingsProviderImpl extends DependencyProvider implements Mappings String yarnMinecraftVersion = yarnVersion.substring(0, yarnVersion.lastIndexOf(separator)); if (!yarnMinecraftVersion.equalsIgnoreCase(minecraftVersion)) { - throw new RuntimeException(String.format("Minecraft Version (%s) does not match yarn's minecraft version (%s)", minecraftVersion, yarnMinecraftVersion)); + getProject().getLogger().warn("Minecraft Version ({}) does not match yarn's minecraft version ({})", minecraftVersion, yarnMinecraftVersion); } // We can save reading the zip file + header by checking the file name diff --git a/src/main/java/net/fabricmc/loom/task/ValidateAccessWidenerTask.java b/src/main/java/net/fabricmc/loom/task/ValidateAccessWidenerTask.java index 7fc9d227..a23bd92e 100644 --- a/src/main/java/net/fabricmc/loom/task/ValidateAccessWidenerTask.java +++ b/src/main/java/net/fabricmc/loom/task/ValidateAccessWidenerTask.java @@ -58,7 +58,7 @@ public abstract class ValidateAccessWidenerTask extends DefaultTask { final LoomGradleExtension extension = LoomGradleExtension.get(getProject()); getAccessWidener().convention(extension.getAccessWidenerPath()).finalizeValueOnRead(); - getTargetJar().convention(getProject().getObjects().fileProperty().fileValue(extension.getMinecraftMappedProvider().getMappedJar())).finalizeValueOnRead(); + getTargetJar().convention(getProject().getLayout().file(getProject().provider(() -> extension.getMinecraftMappedProvider().getMappedJar()))).finalizeValueOnRead(); } @TaskAction |