Legacy plugin for 1.17 to 1.20.1 #118

shartte · 2024-07-29T23:33:12Z

Adds a separate net.neoforged.moddev.legacy plugin that lives in a different sourceset and can be used to develop for Minecraft and Forge 1.17 to 1.20.1.

neoforged-pr-publishing · 2024-07-29T23:33:25Z

Publish PR to GitHub Packages

Last commit published: 72efbd34f1d2de32da59c63ee9b4bcdf27aaec56.

PR Publishing

The artifacts published by this PR:

Repository Declaration

In order to use the artifacts published by the PR, add the following repository to your buildscript:

repositories {
    maven {
        name 'Maven for PR #118' // https://github.com/neoforged/ModDevGradle/pull/118
        url 'https://prmaven.neoforged.net/ModDevGradle/pr118'
        content {
            includeModule('net.neoforged', 'moddev-gradle')
            includeModule('net.neoforged.moddev', 'net.neoforged.moddev.gradle.plugin')
            includeModule('net.neoforged.moddev.repositories', 'net.neoforged.moddev.repositories.gradle.plugin')
            includeModule('net.neoforged.moddev.legacy', 'net.neoforged.moddev.legacy.gradle.plugin')
        }
    }
}

neoforged-automation · 2024-08-13T20:22:59Z

@shartte, this pull request has conflicts, please resolve them for this PR to move forward.

Technici4n

Not too bad. However, it is clear that this can only work as long as keep the toolchain essentially the same. When we will remove the legacy CP, this legacy plugin will go out of the window. This is also why I don't see this ever supporting 1.16. This raises the question of whether the plugin should exist in the same branch or not.

Technici4n · 2024-09-11T13:20:08Z

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip


Suggested change

distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip

distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-all.zip

We are writing a plugin, I want the sources.

Technici4n · 2024-09-11T13:20:46Z

legacytest/build.gradle

+repositories {
+    mavenLocal()
+    maven {
+        name 'cursemaven'
+        url 'https://cursemaven.com'
+        content {
+            includeGroup "curse.maven"
+        }
+    }
+}


Remove unused mavens. (Before merging)

Technici4n · 2024-09-11T13:22:04Z

legacytest/forge/build.gradle

+
+dependencies {
+    modCompileOnly('mezz.jei:jei-1.20.1-forge:15.17.0.76') {
+        transitive = false


Technici4n · 2024-09-11T13:22:17Z

legacytest/forge/build.gradle

+dependencies {
+    modCompileOnly('mezz.jei:jei-1.20.1-forge:15.17.0.76') {
+        transitive = false
+    }
+    modRuntimeOnly('curse.maven:mekanism-268560:5662583')
+    modImplementation('curse.maven:applied-energistics-2-223794:5641282')
+}


Do we really want to have these deps in repo? 😅

Technici4n · 2024-09-11T13:27:24Z

src/legacy/java/net/neoforged/moddevgradle/legacy/MixinExtension.java

+import javax.inject.Inject;
+import java.util.List;
+
+public abstract class MixinExtension {


We should move all extensions to a root extension. For example neoForgeLegacy.

Technici4n · 2024-09-11T14:24:38Z

src/main/java/net/neoforged/moddevgradle/internal/RunUtils.java

@@ -244,7 +257,7 @@ public static ModFoldersProvider getIdeaModFoldersProvider(Project project,
            folders = getModFoldersForGradle(project, modsProvider, includeUnitTests);
        }

-        var modFoldersProvider = project.getObjects().newInstance(ModFoldersProvider.class);
+        var modFoldersProvider = project.getObjects().newInstance(ModFoldersProvider.class, project);


Unnecessary.

Technici4n · 2024-09-11T14:25:25Z

src/main/java/net/neoforged/moddevgradle/internal/RunUtils.java

@@ -395,24 +408,29 @@ record AssetProperties(String assetIndex, String assetsRoot) {

 abstract class ModFoldersProvider implements CommandLineArgumentProvider {
    @Inject
-    public ModFoldersProvider() {
+    public ModFoldersProvider(Project project) {
+        getClassesArgument().set(project.provider(() -> {


You don't need the ugly provider call. You can use getModFolders().map(...).

Technici4n · 2024-09-11T14:26:04Z

src/main/java/net/neoforged/moddevgradle/internal/UserDevConfig.java


 public record UserDevConfig(String mcp, String sources, String universal, List<String> libraries, List<String> modules,
                            Map<String, UserDevRunType> runs) implements Serializable {
    public static UserDevConfig from(File userDevFile) {
+        // For backwards compatibility reasons we also support loading this from the userdev jar


I don't like this at all, it's such a hack.

Technici4n · 2024-09-11T14:26:28Z

testproject/oldneo/build.gradle

@@ -0,0 +1,8 @@
+


not working (yet)?

Technici4n · 2024-09-11T14:27:22Z

src/main/java/net/neoforged/moddevgradle/internal/ModDevPlugin.java

                        RunUtils.escapeJvmArg(RunUtils.getEclipseModFoldersProvider(project, run.getMods(), false).getArgument())
                )
                .args(RunUtils.escapeJvmArg(RunUtils.getArgFileParameter(prepareTask.getProgramArgsFile().get())))
-                .envVar(run.getEnvironment().get())
+                .envVar(RunUtils.replaceModClassesEnv(run, () -> RunUtils.getEclipseModFoldersProvider(project, run.getMods(), false)))


Not to mention that this sets both MOD_CLASSES and --fml.modFolders.

shartte added 4 commits July 30, 2024 00:32

qip

9e9d1df

WIP

7d59484

legacy

609d2e6

1.19.2 works

ba14064

Remove unused

bda6010

neoforged-automation bot added the needs rebase This Pull Request needs to be rebased before being merged label Aug 13, 2024

Merge remote-tracking branch 'origin/main' into legacy

37ddb70

neoforged-automation bot removed the needs rebase This Pull Request needs to be rebased before being merged label Sep 6, 2024

Matyrobbrt and others added 20 commits September 6, 2024 11:24

Move legacy stuff to a legacy sourceset

c49a82f

Add a task to reobfuscate jar

7cc384d

Get runs working, remap deps

26c0e67

Configure Mixin refmap runtime

bf12a2b

Configure Mixin AP

eeb9447

Initially split duplicate metadata transform code

15de0a2

A bit of metadata cleanup

bb0ec01

Fix mixin extension args

e5c9d87

Fixes related to mixin

24f55be

Changes to reobf and mixin

aee4012

Replace MOD_CLASSES if present in the run when generating IDE runs

9644a39

Update NFRT version

d5a97b6

Update settings.gradle

76b38f6

Update build-prs.yml

93b6d95

Bump NFRT

8f268d0

Correct gradlew permissions

37414b1

fix gradlew permissions

78e7eeb

Remove NFRT included build

979ef63

Bump to Gradle 8.10

583aa64

Bump to Gradle 8.10

f5b4d0a

Matyrobbrt added 5 commits September 9, 2024 15:48

Donțt create launch scripts on ide sync

2769357

Add a data run

6f70e0d

Cache the transforms

558b812

Change the cliet-extra name

c9fbd6d

Use another prefix (at least for now?)

8e85660

Matyrobbrt marked this pull request as ready for review September 10, 2024 09:41

Matyrobbrt changed the title ~~Legacy~~ Legacy plugin for 1.17 to 1.20.1 Sep 10, 2024

Matyrobbrt added 3 commits September 10, 2024 17:12

Some docs

1e959e8

Don't add the mapped@ prefix

58503da

Move createLaunchScript to non-internal

72efbd3

Technici4n requested changes Sep 11, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Legacy plugin for 1.17 to 1.20.1 #118

Legacy plugin for 1.17 to 1.20.1 #118

shartte commented Jul 29, 2024 •

edited by Matyrobbrt

Loading

neoforged-pr-publishing bot commented Jul 29, 2024 •

edited

Loading

The artifacts published by this PR:

Repository Declaration

neoforged-automation bot commented Aug 13, 2024

Technici4n left a comment

Technici4n Sep 11, 2024

Technici4n Sep 11, 2024

Technici4n Sep 11, 2024

Technici4n Sep 11, 2024

Technici4n Sep 11, 2024

Technici4n Sep 11, 2024

Technici4n Sep 11, 2024

Technici4n Sep 11, 2024

Technici4n Sep 11, 2024

Technici4n Sep 11, 2024

	distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
	distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-all.zip

Legacy plugin for 1.17 to 1.20.1 #118

Are you sure you want to change the base?

Legacy plugin for 1.17 to 1.20.1 #118

Conversation

shartte commented Jul 29, 2024 • edited by Matyrobbrt Loading

neoforged-pr-publishing bot commented Jul 29, 2024 • edited Loading

The artifacts published by this PR:

Repository Declaration

neoforged-automation bot commented Aug 13, 2024

Technici4n 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

shartte commented Jul 29, 2024 •

edited by Matyrobbrt

Loading

neoforged-pr-publishing bot commented Jul 29, 2024 •

edited

Loading