gradle cleanup #645

supersaiyansubtlety · 2024-09-28T10:19:33Z

Based on #643 because it builds on it a bit.
Will also have to wait for #644.

Tasks:

…round proposer conflicts, make simple_type_field_names_path an input of insertAutoGeneratedMappings task, make 'id' simple type name exclusive

Co-authored-by: Eli Orona <[email protected]>

…ames rename IdListUtil#sortArray -> createByIdGetter make enums that use createByIdGetter consistent restore SpawnReason add simple type names for Entity+LivinEntity add stub FindInvalidSimpleTypeFieldNamesTask class map a few other things along the way

…simple type names)

…e type names

…betterly

…bettererly move EnigmaProfile to MappingsExtension

…asks should not be retreived by type alone, adding a new task with the same type would break things (most calls to MappingsTask::getTaskNamed will probably be eliminated when configuration is moved to MappingsPlugin) the thisening the abstractening the finalening the line wrappening

supersaiyansubtlety · 2024-09-28T10:31:06Z

Early reviewers beware: I will probably be rewriting history so any review progress on github may be lost.

add missing get() to extractServerJar

…guration to MappingsPlugin refine downloadWantedVersionManifest inputs/outputs

…tion to MappingsExtension refine their properties and dependencies make ExtractServerJarTask's getServerBootstrapJar() an input instead of an output make downloadMinecraftJars not finalizedBy extractServerJar as input/output handling is preferable

…figuration to MappingsPlugin rework both tasks' inputs and outputs significantly downloadMinecraftLibraries is still screwy though: it accesses and modifies project in its task action add Task suffix to OpenGlConstantUnpickGenerator class rename PropertyUtil -> ProviderUtil and add projectDirProviderOf

…operties, and separated ExtractTinyMappingsTask added ExtractTinyMappingsTasks for hashed and intermediary removed DownloadIntermediaryMappingsTask class, it's just a DownloadMappingsTask now added Constants.INTERMEDIARY_MAPPINGS_NAME, but haven't replaced duplicates yet made some convensions in MappingsPlugin to use flatMap instead of lambdas move MappingsExtension's getEnigmaProfileFile convension to MappingsPlugin

…diaryTask to MappingsPlugin refine their and their superclass' properties

github-actions · 2024-10-01T15:08:17Z

🚨 Target branch is already set to 24w39a

github-actions · 2024-10-03T00:36:33Z

🚀 Target branch has been updated to 24w40a

github-actions · 2024-10-03T00:36:34Z

🚨 Please fix merge conflicts before this can be merged

lukebemish

Looks pretty good! Unsure if the eventual aim is config cache here (and maybe it ought to be, as config cache will be on by default in gradle 9 which is on the horizon) -- regardless, if so there's a bit of work to do, since a lot of stuff is still kinda unidiomatic in that regard; all things told though a drastic improvement. Didn't comment on any remaining TODOs.

lukebemish · 2024-10-03T01:16:37Z

buildSrc/src/main/java/quilt/internal/MappingsExtension.java

+ public MappingsExtension(Project project) {
+ this.fileConstants = new FileConstants(project);
+
+ this.enigmaProfile = this.getEnigmaProfileFile()


maped providers are not cached, and I assume this is used in several placed -- so instead of having, say, a public final Provider<EnigmaProfile> enigmaProfile, have a Property<EnigmaProfile> and set it to the mapped provider, which is cached

lukebemish · 2024-10-03T01:17:50Z

buildSrc/src/main/java/quilt/internal/MappingsPlugin.java

- task.getMappingDirectory().set(mappingLintTask.getMappingDirectory());
- mappingLintTask.dependsOn(task);
+ public void apply(@NotNull Project project) {
+ final var ext = project.getExtensions().create("mappings", MappingsExtension.class, project);


Not really a big deal, but the Project can just be @Injected here.

lukebemish · 2024-10-03T01:21:34Z

buildSrc/src/main/java/quilt/internal/tasks/EnigmaProfileConsumingTask.java

+ "Up-to-date-ness is ensured by getSimpleTypeFieldNamesFiles and its source, " +
+ "MappingsExtension::getEnigmaProfileFile."
+ )
+ public abstract Property<EnigmaProfile> getEnigmaProfile();


This is enough for build cache, but won't get you to config cache -- all task properties need to be serialize-able or transient (in which case they may not exist at task runtime), @Internal or @Inputs or @Outputs or whatever. Question for your consideration: is there ever more than a single EnigmaProfile created by this plugin, at all? If the answer is no, use a build service!

lukebemish · 2024-10-03T01:25:22Z

buildSrc/src/main/java/quilt/internal/tasks/EnigmaProfileConsumingTask.java

+ @Internal(
+ "An EnigmaProfile cannot be fingerprinted. " +
+ "Up-to-date-ness is ensured by getSimpleTypeFieldNamesFiles and its source, " +
+ "MappingsExtension::getEnigmaProfileFile."


Is MappingsExtension::getEnigmaProfileFile ever actually marked/added as a task input? Or is the only stuff from it that can affect stuff the simpleTypeFieldNamesFiles?

lukebemish · 2024-10-03T01:34:33Z

buildSrc/src/main/java/quilt/internal/tasks/decompile/DecompileTask.java

 }

- decompiler.decompile(getInput().getAsFile().get(), getOutput().getAsFile().get(), options, libraries);
+ decompiler.decompile(this.getInput().getAsFile().get(), this.getOutput().getAsFile().get(), options, libraries);
 }

 @Internal
 public AbstractDecompiler getAbstractDecompiler() {


Similar to the EnigmaProfile stuff above -- this is not conf cache compatible, and looks like a perfect place to use a build service.

lukebemish · 2024-10-03T01:47:19Z

buildSrc/src/main/java/quilt/internal/tasks/setup/DownloadMinecraftLibrariesTask.java

+ @OutputDirectory
+ public abstract DirectoryProperty getLibrariesDir();
+
+ @Internal("Fingerprinting is handled by getLibrariesDir")


Same as above

lukebemish · 2024-10-03T01:48:16Z

buildSrc/src/main/java/quilt/internal/tasks/unpick/gen/OpenGlConstantUnpickGeneratorTask.java

+ public abstract RegularFileProperty getPerVersionMappingsJar();
+
+ @Input
+ public abstract MapProperty<String, File> getArtifactsByUrl();


I have a sneaking suspicion this is meant to be @InputFiles, if you're using the artifacts' contents.

lukebemish · 2024-10-03T01:51:27Z

buildSrc/src/main/java/quilt/internal/tasks/diff/CheckTargetVersionExistsTask.java

 import org.gradle.api.tasks.Internal;
 import org.gradle.api.tasks.OutputFile;
 import org.gradle.api.tasks.TaskAction;
 import quilt.internal.Constants;
 import quilt.internal.tasks.DefaultMappingsTask;

-public class CheckTargetVersionExistsTask extends DefaultMappingsTask {
+public abstract class CheckTargetVersionExistsTask extends DefaultMappingsTask {
 public static final String TASK_NAME = "checkTargetVersionExists";

 @Internal


Uh... I don't like whatever this is doing. Does it set the field during task execution then expect tasks running after it to grab the field from the task and use it? Iffy, to say the least, though I suppose functional. Regardless -- I'd annotate the method, not the field, here in either case.

lukebemish · 2024-10-03T01:51:58Z

buildSrc/src/main/java/quilt/internal/tasks/diff/CheckUnpickVersionsMatchTask.java

 public static final String TASK_NAME = "checkUnpickVersionsMatch";

 @InputFile
- private final RegularFileProperty unpickJson;
+ public abstract RegularFileProperty getUnpickJson();

 @Internal
 private boolean match = false;


Same as my worry with targetVersion above -- I'm not quite sold on this approach, it seems like a bit of a bad pattern.

lukebemish · 2024-10-03T01:52:51Z

buildSrc/src/main/java/quilt/internal/tasks/setup/CheckIntermediaryMappingsTask.java

+// TODO eliminate this task (or make it a super class of tasks that currently depend on it)
+// Tasks that depend on it should instead take the intermediary configuration as input and check if it exists and
+// can be resolved
+public abstract class CheckIntermediaryMappingsTask extends DefaultMappingsTask {
 public static final String TASK_NAME = "checkIntermediaryMappings";

 @Internal


Ooh, here's another of whatever-the-heck these are!

supersaiyansubtlety and others added 18 commits September 22, 2024 00:02

complete SharedConstants

cf40d52

complete n.m.village

82ceedd

remove 'registryKey' from simple_type_field_names

31a647b

registry work

8b28730

complete n.m.registry.tag, more registry work

a88c6ec

explicitly map CommandTreeUpdateS2CPacket consturctor param to work a…

e5ce8c3

…round proposer conflicts, make simple_type_field_names_path an input of insertAutoGeneratedMappings task, make 'id' simple type name exclusive

complete n.m.registry

3e107f0

Add class comments to new simple type names

31f60c0

Co-authored-by: Eli Orona <[email protected]>

complete Items with the help of simple type names

fe1096c

half way there! (through RegistryKeys affected by their removal from …

bfce206

…simple type names)

finished! fixing up RegistryKeys affected by their removal from simpl…

afe70fb

…e type names

fix typos

f09e955

remove FindInvalidSimpleTypeFieldNamesTask stub for separate PR

a1a050b

fixup a few things folling self-review

8d5f91f

make simple_type_field_names an input of insertAutoGeneratedMappings …

89139e6

…betterly

make simple_type_field_names an input of insertAutoGeneratedMappings …

3158034

…bettererly move EnigmaProfile to MappingsExtension

supersaiyansubtlety added enhancement new feature or request t: toolchain changes to the quilt mappings toolchain outdated this pull request hasn't been updated to the latest version or has merge conflicts wip this is a work in progress labels Sep 28, 2024

supersaiyansubtlety self-assigned this Sep 28, 2024

supersaiyansubtlety added 6 commits September 28, 2024 13:09

the registerening

617179f

add missing get() to extractServerJar

move downloadVersionsManifest and downloadWantedVersionManifest confi…

ce5a5ed

…guration to MappingsPlugin refine downloadWantedVersionManifest inputs/outputs

move conventions for MergeTinyTask, MergeTinyV2Task, and MergeInterme…

6391a20

…diaryTask to MappingsPlugin refine their and their superclass' properties

supersaiyansubtlety force-pushed the procrastination+gradle-cleanup branch from afcb886 to 6391a20 Compare October 1, 2024 05:32

ix0rai added the update-base used to notify github actions that the base branch should be updated label Oct 1, 2024

github-actions bot removed the update-base used to notify github actions that the base branch should be updated label Oct 1, 2024

ix0rai added the update-base used to notify github actions that the base branch should be updated label Oct 3, 2024

github-actions bot changed the base branch from 24w39a to 24w40a October 3, 2024 00:36

github-actions bot added v: snapshot targets a snapshot version of minecraft and removed update-base used to notify github actions that the base branch should be updated labels Oct 3, 2024

lukebemish reviewed Oct 3, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

gradle cleanup #645

gradle cleanup #645

supersaiyansubtlety commented Sep 28, 2024 •

edited

Loading

supersaiyansubtlety commented Sep 28, 2024

github-actions bot commented Oct 1, 2024

github-actions bot commented Oct 3, 2024

github-actions bot commented Oct 3, 2024

lukebemish left a comment

lukebemish Oct 3, 2024

lukebemish Oct 3, 2024

lukebemish Oct 3, 2024

lukebemish Oct 3, 2024

lukebemish Oct 3, 2024

lukebemish Oct 3, 2024

lukebemish Oct 3, 2024

lukebemish Oct 3, 2024

lukebemish Oct 3, 2024

lukebemish Oct 3, 2024

gradle cleanup #645

Are you sure you want to change the base?

gradle cleanup #645

Conversation

supersaiyansubtlety commented Sep 28, 2024 • edited Loading

supersaiyansubtlety commented Sep 28, 2024

github-actions bot commented Oct 1, 2024

github-actions bot commented Oct 3, 2024

github-actions bot commented Oct 3, 2024

lukebemish left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

supersaiyansubtlety commented Sep 28, 2024 •

edited

Loading