hibiscus-client/fabric-loom
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use better gradle conventions, and fix #311 (#503)

Browse source 
* Use better gradle conventions, and fix #311

* Fix checkstyle

* Revert some changes

* Use convention

* Remove set classpath
This commit is contained in:
shedaniel 2021-09-23 04:59:51 +08:00 committed by GitHub
parent 06e60e5c29
commit be17a02e90
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java
View file

@ -114,8 +114,8 @@ public class RemapConfiguration {
if (isDefaultRemap) { if (isDefaultRemap) {
extension.getUnmappedModCollection().from(jarTask); extension.getUnmappedModCollection().from(jarTask);
remapJarTask.getAddNestedDependencies().set(true); remapJarTask.getAddNestedDependencies().convention(true);
remapJarTask.getRemapAccessWidener().set(true); remapJarTask.getRemapAccessWidener().convention(true);
project.getArtifacts().add("archives", remapJarTask); project.getArtifacts().add("archives", remapJarTask);
} }

15
src/main/java/net/fabricmc/loom/task/RemapJarTask.java
View file

@ -91,15 +91,16 @@ public class RemapJarTask extends Jar {
public RemapJarTask() { public RemapJarTask() {
super(); super();
LoomGradleExtension extension = LoomGradleExtension.get(getProject());
input = getProject().getObjects().fileProperty(); input = getProject().getObjects().fileProperty();
addNestedDependencies = getProject().getObjects().property(Boolean.class); addNestedDependencies = getProject().getObjects().property(Boolean.class)
addDefaultNestedDependencies = getProject().getObjects().property(Boolean.class); .convention(false);
remapAccessWidener = getProject().getObjects().property(Boolean.class); addDefaultNestedDependencies = 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 .convention(true);
remapAccessWidener.set(false); remapAccessWidener = getProject().getObjects().property(Boolean.class)
addDefaultNestedDependencies.set(true); .convention(false);
if (!LoomGradleExtension.get(getProject()).getMixin().getUseLegacyMixinAp().get()) { if (!extension.getMixin().getUseLegacyMixinAp().get()) {
remapOptions.add(b -> b.extension(new MixinExtension())); remapOptions.add(b -> b.extension(new MixinExtension()));
} }
} }

1
src/main/java/net/fabricmc/loom/task/RunClientTask.java
View file

@ -34,5 +34,6 @@ public class RunClientTask extends AbstractRunTask {
LoomGradleExtension extension = LoomGradleExtension.get(project); LoomGradleExtension extension = LoomGradleExtension.get(project);
return RunConfig.runConfig(project, extension.getRunConfigs().getByName("client")); return RunConfig.runConfig(project, extension.getRunConfigs().getByName("client"));
}); });
LoomGradleExtension.get(getProject()).getDeprecationHelper().replaceWithInLoom0_11("RunClientTask", "RunGameTask");
} }
} }

1
src/main/java/net/fabricmc/loom/task/RunServerTask.java
View file

@ -34,5 +34,6 @@ public class RunServerTask extends AbstractRunTask {
LoomGradleExtension extension = LoomGradleExtension.get(project); LoomGradleExtension extension = LoomGradleExtension.get(project);
return RunConfig.runConfig(project, extension.getRunConfigs().getByName("client")); return RunConfig.runConfig(project, extension.getRunConfigs().getByName("client"));
}); });
LoomGradleExtension.get(getProject()).getDeprecationHelper().replaceWithInLoom0_11("RunServerTask", "RunGameTask");
} }
} }