diff --git a/src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java index b7e111e..cf6d1e9 100644 --- a/src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java +++ b/src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java @@ -114,8 +114,8 @@ public class RemapConfiguration { if (isDefaultRemap) { extension.getUnmappedModCollection().from(jarTask); - remapJarTask.getAddNestedDependencies().set(true); - remapJarTask.getRemapAccessWidener().set(true); + remapJarTask.getAddNestedDependencies().convention(true); + remapJarTask.getRemapAccessWidener().convention(true); project.getArtifacts().add("archives", remapJarTask); } diff --git a/src/main/java/net/fabricmc/loom/task/RemapJarTask.java b/src/main/java/net/fabricmc/loom/task/RemapJarTask.java index 2fc6b3c..3729326 100644 --- a/src/main/java/net/fabricmc/loom/task/RemapJarTask.java +++ b/src/main/java/net/fabricmc/loom/task/RemapJarTask.java @@ -91,15 +91,16 @@ public class RemapJarTask extends Jar { public RemapJarTask() { super(); + LoomGradleExtension extension = LoomGradleExtension.get(getProject()); input = getProject().getObjects().fileProperty(); - addNestedDependencies = getProject().getObjects().property(Boolean.class); - addDefaultNestedDependencies = getProject().getObjects().property(Boolean.class); - remapAccessWidener = getProject().getObjects().property(Boolean.class); - // false by default, I have no idea why I have to do it for this property and not the other one - remapAccessWidener.set(false); - addDefaultNestedDependencies.set(true); + addNestedDependencies = getProject().getObjects().property(Boolean.class) + .convention(false); + addDefaultNestedDependencies = getProject().getObjects().property(Boolean.class) + .convention(true); + remapAccessWidener = getProject().getObjects().property(Boolean.class) + .convention(false); - if (!LoomGradleExtension.get(getProject()).getMixin().getUseLegacyMixinAp().get()) { + if (!extension.getMixin().getUseLegacyMixinAp().get()) { remapOptions.add(b -> b.extension(new MixinExtension())); } } diff --git a/src/main/java/net/fabricmc/loom/task/RunClientTask.java b/src/main/java/net/fabricmc/loom/task/RunClientTask.java index cfe50a0..4120dd8 100644 --- a/src/main/java/net/fabricmc/loom/task/RunClientTask.java +++ b/src/main/java/net/fabricmc/loom/task/RunClientTask.java @@ -34,5 +34,6 @@ public class RunClientTask extends AbstractRunTask { LoomGradleExtension extension = LoomGradleExtension.get(project); return RunConfig.runConfig(project, extension.getRunConfigs().getByName("client")); }); + LoomGradleExtension.get(getProject()).getDeprecationHelper().replaceWithInLoom0_11("RunClientTask", "RunGameTask"); } } diff --git a/src/main/java/net/fabricmc/loom/task/RunServerTask.java b/src/main/java/net/fabricmc/loom/task/RunServerTask.java index 748d418..635c534 100644 --- a/src/main/java/net/fabricmc/loom/task/RunServerTask.java +++ b/src/main/java/net/fabricmc/loom/task/RunServerTask.java @@ -34,5 +34,6 @@ public class RunServerTask extends AbstractRunTask { LoomGradleExtension extension = LoomGradleExtension.get(project); return RunConfig.runConfig(project, extension.getRunConfigs().getByName("client")); }); + LoomGradleExtension.get(getProject()).getDeprecationHelper().replaceWithInLoom0_11("RunServerTask", "RunGameTask"); } }