Implement support for split datagen (MC 1.21.4+)

neoforged · Nov 24, 2024 · 66bff83 · 66bff83
1 parent 703cf83
commit 66bff83
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 1 deletion.
diff --git a/src/main/java/net/neoforged/moddevgradle/dsl/RunModel.java b/src/main/java/net/neoforged/moddevgradle/dsl/RunModel.java
@@ -156,8 +156,21 @@ public void client() {
         getType().set("client");
     }
 
+    /**
+     * Equivalent to setting {@code type = "clientData"}.
+     *
+     * <p>Should only be used for Minecraft versions starting from 1.21.4.
+     * (The first snapshot that supports this is 24w45a).
+     */
+    public void clientData() {
+        getType().set("clientData");
+    }
+
     /**
      * Equivalent to setting {@code type = "data"}.
+     *
+     * <p>Should only be used for Minecraft versions up to 1.21.3 included.
+     * (The last snapshot that supports this is 24w44a).
      */
     public void data() {
         getType().set("data");
@@ -170,6 +183,16 @@ public void server() {
         getType().set("server");
     }
 
+    /**
+     * Equivalent to setting {@code type = "serverData"}.
+     *
+     * <p>Should only be used for Minecraft versions starting from 1.21.4.
+     * (The first snapshot that supports this is 24w45a).
+     */
+    public void serverData() {
+        getType().set("serverData");
+    }
+
     /**
      * Equivalent to setting {@code ideName = ""}
      */

diff --git a/src/main/java/net/neoforged/moddevgradle/internal/ModDevPlugin.java b/src/main/java/net/neoforged/moddevgradle/internal/ModDevPlugin.java
@@ -553,7 +553,7 @@ private static TaskProvider<PrepareRun> setupRunInGradle(
             spec.shouldResolveConsistentlyWith(runtimeClasspathConfig.get());
             spec.attributes(attributes -> {
                 attributes.attributeProvider(MinecraftDistribution.ATTRIBUTE, type.map(t -> {
-                    var name = t.equals("client") || t.equals("data") ? MinecraftDistribution.CLIENT : MinecraftDistribution.SERVER;
+                    var name = t.equals("client") || t.equals("data") || t.equals("clientData") ? MinecraftDistribution.CLIENT : MinecraftDistribution.SERVER;
                     return project.getObjects().named(MinecraftDistribution.class, name);
                 }));
                 setNamedAttribute(project, attributes, Usage.USAGE_ATTRIBUTE, Usage.JAVA_RUNTIME);

diff --git a/src/main/java/net/neoforged/moddevgradle/internal/PrepareRunOrTest.java b/src/main/java/net/neoforged/moddevgradle/internal/PrepareRunOrTest.java
@@ -154,8 +154,15 @@ private UserDevConfig getSimulatedUserDevConfigForVanilla() {
                 "server", new UserDevRunType(
                         true, "net.minecraft.server.Main", commonArgs, List.of(), false, true, false, false, Map.of(), Map.of()
                 ),
+                // TODO: find a way to check for Minecraft version?
                 "data", new UserDevRunType(
                         true, "net.minecraft.data.Main", commonArgs, List.of(), false, false, true, false, Map.of(), Map.of()
+                ),
+                "clientData", new UserDevRunType(
+                        true, "net.minecraft.client.data.Main", commonArgs, List.of(), false, false, true, false, Map.of(), Map.of()
+                ),
+                "serverData", new UserDevRunType(
+                        true, "net.minecraft.data.Main", commonArgs, List.of(), false, false, true, false, Map.of(), Map.of()
                 )
         ));
     }