3737import java .io .File ;
3838import java .net .URI ;
3939import java .util .ArrayList ;
40+ import java .util .Collections ;
4041import java .util .List ;
4142import java .util .Map ;
4243import java .util .function .Consumer ;
@@ -100,24 +101,39 @@ public void apply(Project project) {
100101 );
101102 var applyAt = configureAccessTransformer (
102103 project ,
103- configurations ,
104104 createSourceArtifacts ,
105105 neoDevBuildDir ,
106106 atFiles );
107107
108108 applyAt .configure (task -> task .mustRunAfter (genAtsTask ));
109109
110- // 3. Apply patches to the source jar from 2.
110+ // 3. Apply interface injections after the ATs
111+ // this jar is only used for the patches in the repo
112+ var applyInterfaceInjection = project .getTasks ().register ("applyInterfaceInjection" , TransformSources .class , task -> {
113+ task .getInputJar ().set (applyAt .flatMap (TransformSources ::getOutputJar ));
114+ task .getInterfaceInjectionData ().from (project .getRootProject ().file ("src/main/resources/META-INF/injected-interfaces.json" ));
115+ task .getOutputJar ().set (neoDevBuildDir .map (dir -> dir .file ("artifacts/interface-injected-sources.jar" )));
116+ });
117+
118+ tasks .withType (TransformSources .class , task -> {
119+ task .setGroup (INTERNAL_GROUP );
120+ task .classpath (configurations .getExecutableTool (Tools .JST ));
121+
122+ task .getLibraries ().from (configurations .neoFormClasspath );
123+ task .getLibrariesFile ().set (neoDevBuildDir .map (dir -> dir .file ("minecraft-libraries-for-" + task .getName () + ".txt" )));
124+ });
125+
126+ // 4. Apply patches to the source jar from 3.
111127 var patchesFolder = project .getRootProject ().file ("patches" );
112128 var applyPatches = tasks .register ("applyPatches" , ApplyPatches .class , task -> {
113129 task .setGroup (INTERNAL_GROUP );
114- task .getOriginalJar ().set (applyAt .flatMap (ApplyAccessTransformer ::getOutputJar ));
130+ task .getOriginalJar ().set (applyInterfaceInjection .flatMap (TransformSources ::getOutputJar ));
115131 task .getPatchesFolder ().set (patchesFolder );
116132 task .getPatchedJar ().set (neoDevBuildDir .map (dir -> dir .file ("artifacts/patched-sources.jar" )));
117133 task .getRejectsFolder ().set (project .getRootProject ().file ("rejects" ));
118134 });
119135
120- // 4 . Unpack jar from 3 .
136+ // 5 . Unpack jar from 4 .
121137 var mcSourcesPath = project .file ("src/main/java" );
122138 tasks .register ("setup" , Sync .class , task -> {
123139 task .setGroup (GROUP );
@@ -185,14 +201,22 @@ public void apply(Project project) {
185201 * OTHER TASKS
186202 */
187203
188- // Generate source patches into a patch archive.
204+ // Generate source patches into a patch archive, based on the jar with injected interfaces .
189205 var genSourcePatches = tasks .register ("generateSourcePatches" , GenerateSourcePatches .class , task -> {
190206 task .setGroup (INTERNAL_GROUP );
191- task .getOriginalJar ().set (applyAt .flatMap (ApplyAccessTransformer ::getOutputJar ));
207+ task .getOriginalJar ().set (applyInterfaceInjection .flatMap (TransformSources ::getOutputJar ));
192208 task .getModifiedSources ().set (project .file ("src/main/java" ));
193209 task .getPatchesJar ().set (neoDevBuildDir .map (dir -> dir .file ("source-patches.zip" )));
194210 });
195211
212+ // Generate source patches that are based on the production environment (without separate interface injection)
213+ var genProductionPatches = tasks .register ("generateProductionSourcePatches" , GenerateSourcePatches .class , task -> {
214+ task .setGroup (INTERNAL_GROUP );
215+ task .getOriginalJar ().set (applyAt .flatMap (TransformSources ::getOutputJar ));
216+ task .getModifiedSources ().set (project .file ("src/main/java" ));
217+ task .getPatchesFolder ().set (neoDevBuildDir .map (dir -> dir .dir ("production-source-patches" )));
218+ });
219+
196220 // Update the patch/ folder with the current patches.
197221 tasks .register ("genPatches" , Sync .class , task -> {
198222 task .setGroup (GROUP );
@@ -245,9 +269,10 @@ public void apply(Project project) {
245269 configurations ,
246270 createCleanArtifacts ,
247271 neoDevBuildDir ,
248- patchesFolder
272+ genProductionPatches . flatMap ( GenerateSourcePatches :: getPatchesFolder )
249273 );
250274
275+ var installerRepositoryUrls = getInstallerRepositoryUrls (project );
251276 // Launcher profile = the version.json file used by the Minecraft launcher.
252277 var createLauncherProfile = tasks .register ("createLauncherProfile" , CreateLauncherProfile .class , task -> {
253278 task .setGroup (INTERNAL_GROUP );
@@ -256,17 +281,7 @@ public void apply(Project project) {
256281 task .getNeoForgeVersion ().set (neoForgeVersion );
257282 task .getRawNeoFormVersion ().set (rawNeoFormVersion );
258283 task .setLibraries (configurations .launcherProfileClasspath );
259- task .getRepositoryURLs ().set (project .provider (() -> {
260- List <URI > repos = new ArrayList <>();
261- for (var repo : project .getRepositories ().withType (MavenArtifactRepository .class )) {
262- var uri = repo .getUrl ();
263- if (!uri .toString ().endsWith ("/" )) {
264- uri = URI .create (uri + "/" );
265- }
266- repos .add (uri );
267- }
268- return repos ;
269- }));
284+ task .getRepositoryURLs ().set (installerRepositoryUrls );
270285 // ${version_name}.jar will be filled out by the launcher. It corresponds to the raw SRG Minecraft client jar.
271286 task .getIgnoreList ().addAll ("client-extra" , "${version_name}.jar" );
272287 task .setModules (configurations .modulePath );
@@ -285,17 +300,7 @@ public void apply(Project project) {
285300 task .addLibraries (configurations .launcherProfileClasspath );
286301 // We need the NeoForm zip for the SRG mappings.
287302 task .addLibraries (configurations .neoFormDataOnly );
288- task .getRepositoryURLs ().set (project .provider (() -> {
289- List <URI > repos = new ArrayList <>();
290- for (var repo : project .getRepositories ().withType (MavenArtifactRepository .class )) {
291- var uri = repo .getUrl ();
292- if (!uri .toString ().endsWith ("/" )) {
293- uri = URI .create (uri + "/" );
294- }
295- repos .add (uri );
296- }
297- return repos ;
298- }));
303+ task .getRepositoryURLs ().set (installerRepositoryUrls );
299304 task .getUniversalJar ().set (universalJar .flatMap (AbstractArchiveTask ::getArchiveFile ));
300305 task .getInstallerProfile ().set (neoDevBuildDir .map (dir -> dir .file ("installer-profile.json" )));
301306
@@ -411,7 +416,7 @@ public void apply(Project project) {
411416 task .from (binaryPatchOutputs .binaryPatchesForMerged (), spec -> {
412417 spec .rename (s -> "joined.lzma" );
413418 });
414- task .from (project .zipTree ( genSourcePatches .flatMap (GenerateSourcePatches ::getPatchesJar )), spec -> {
419+ task .from (project .fileTree ( genProductionPatches .flatMap (GenerateSourcePatches ::getPatchesFolder )), spec -> {
415420 spec .into ("patches/" );
416421 });
417422 });
@@ -444,32 +449,51 @@ public void apply(Project project) {
444449 setupProductionServerTest (project , installerJar );
445450 }
446451
447- private static TaskProvider <ApplyAccessTransformer > configureAccessTransformer (
452+ /**
453+ * Get the list of Maven repositories that may contain artifacts for the installer.
454+ */
455+ private static Provider <List <URI >> getInstallerRepositoryUrls (Project project ) {
456+ return project .provider (() -> {
457+ List <URI > repos = new ArrayList <>();
458+ var projectRepos = project .getRepositories ();
459+ if (!projectRepos .isEmpty ()) {
460+ for (var repo : projectRepos .withType (MavenArtifactRepository .class )) {
461+ repos .add (repo .getUrl ());
462+ }
463+ } else {
464+ // If no project repos are defined, use the repository list we exposed in settings.gradle via an extension
465+ // See the end of settings.gradle for details
466+ Collections .addAll (repos , (URI []) project .getGradle ().getExtensions ().getByName ("repositoryBaseUrls" ));
467+ }
468+
469+ // Ensure all base urls end with a slash
470+ repos .replaceAll (uri -> uri .toString ().endsWith ("/" ) ? uri : URI .create (uri + "/" ));
471+
472+ return repos ;
473+ });
474+ }
475+
476+ private static TaskProvider <TransformSources > configureAccessTransformer (
448477 Project project ,
449- NeoDevConfigurations configurations ,
450478 TaskProvider <CreateMinecraftArtifacts > createSourceArtifacts ,
451479 Provider <Directory > neoDevBuildDir ,
452480 List <File > atFiles ) {
453481
454482 // Pass -PvalidateAccessTransformers to validate ATs.
455483 var validateAts = project .getProviders ().gradleProperty ("validateAccessTransformers" ).map (p -> true ).orElse (false );
456- return project .getTasks ().register ("applyAccessTransformer" , ApplyAccessTransformer .class , task -> {
457- task .setGroup (INTERNAL_GROUP );
458- task .classpath (configurations .getExecutableTool (Tools .JST ));
484+ return project .getTasks ().register ("applyAccessTransformer" , TransformSources .class , task -> {
459485 task .getInputJar ().set (createSourceArtifacts .flatMap (CreateMinecraftArtifacts ::getSourcesArtifact ));
460486 task .getAccessTransformers ().from (atFiles );
461- task .getValidate ().set (validateAts );
487+ task .getValidateAccessTransformers ().set (validateAts );
462488 task .getOutputJar ().set (neoDevBuildDir .map (dir -> dir .file ("artifacts/access-transformed-sources.jar" )));
463- task .getLibraries ().from (configurations .neoFormClasspath );
464- task .getLibrariesFile ().set (neoDevBuildDir .map (dir -> dir .file ("minecraft-libraries-for-jst.txt" )));
465489 });
466490 }
467491
468492 private static BinaryPatchOutputs configureBinaryPatchCreation (Project project ,
469493 NeoDevConfigurations configurations ,
470494 TaskProvider <CreateCleanArtifacts > createCleanArtifacts ,
471495 Provider <Directory > neoDevBuildDir ,
472- File sourcesPatchesFolder ) {
496+ Provider < Directory > sourcesPatchesFolder ) {
473497 var tasks = project .getTasks ();
474498
475499 var artConfig = configurations .getExecutableTool (Tools .AUTO_RENAMING_TOOL );
0 commit comments