From 0837451f9e02ffeb12ac4ec50bfe5f18d156faa8 Mon Sep 17 00:00:00 2001
From: modmuss50 <modmuss50@gmail.com>
Date: Sun, 1 Dec 2024 15:01:03 +0000
Subject: [PATCH] Loom 1.9, Gradle 8.11.1 and run datagen from client

---
 scripts/src/lib/Versions.svelte                             | 2 +-
 scripts/src/lib/template/modentrypoint.ts                   | 6 ++++--
 .../lib/template/templates/gradle/groovy/build.gradle.eta   | 6 ++++--
 .../gradle/wrapper/gradle/wrapper/gradle-wrapper.properties | 2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/scripts/src/lib/Versions.svelte b/scripts/src/lib/Versions.svelte
index b018795f..898e75a7 100644
--- a/scripts/src/lib/Versions.svelte
+++ b/scripts/src/lib/Versions.svelte
@@ -82,7 +82,7 @@ fabric_version={apiVersion}
 
 <h2>Loom</h2>
 
-<p>The recommended loom version is <strong>1.8-SNAPSHOT</strong>. This is usually defined near the top of your build.gradle file.</p>
+<p>The recommended loom version is <strong>1.9-SNAPSHOT</strong>. This is usually defined near the top of your build.gradle file.</p>
 
 <style>
     .copy-code {
diff --git a/scripts/src/lib/template/modentrypoint.ts b/scripts/src/lib/template/modentrypoint.ts
index b25d0eeb..b971fbc7 100644
--- a/scripts/src/lib/template/modentrypoint.ts
+++ b/scripts/src/lib/template/modentrypoint.ts
@@ -69,7 +69,8 @@ async function generateJavaEntrypoint(writer: TemplateWriter, options: ClassOpti
     }
 
     if (options.dataEntrypoint) {
-        await writer.write(`src/main/java/${options.path}DataGenerator.java`, renderTemplate(javaEntrypointDataGeneratorTemplate, {...options, className: options.className + "DataGenerator"}));
+        const sourceSet = options.clientEntrypoint ? "client" : "main";
+        await writer.write(`src/${sourceSet}/java/${options.path}DataGenerator.java`, renderTemplate(javaEntrypointDataGeneratorTemplate, {...options, className: options.className + "DataGenerator"}));
 
         entrypoints = {
             ...entrypoints,
@@ -109,7 +110,8 @@ async function generateKotlinEntrypoint(writer: TemplateWriter, options: ClassOp
     }
 
     if (options.dataEntrypoint) {
-        await writer.write(`src/main/kotlin/${options.path}DataGenerator.kt`, renderTemplate(kotlinEntrypointDataGeneratorTemplate, {...options, className: options.className + "DataGenerator"}))
+        const sourceSet = options.clientEntrypoint ? "client" : "main";
+        await writer.write(`src/${sourceSet}/kotlin/${options.path}DataGenerator.kt`, renderTemplate(kotlinEntrypointDataGeneratorTemplate, {...options, className: options.className + "DataGenerator"}))
 
         entrypoints = {
             ...entrypoints,
diff --git a/scripts/src/lib/template/templates/gradle/groovy/build.gradle.eta b/scripts/src/lib/template/templates/gradle/groovy/build.gradle.eta
index 8fa38d56..d37db3a3 100644
--- a/scripts/src/lib/template/templates/gradle/groovy/build.gradle.eta
+++ b/scripts/src/lib/template/templates/gradle/groovy/build.gradle.eta
@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.8-SNAPSHOT'
+	id 'fabric-loom' version '1.9-SNAPSHOT'
 	id 'maven-publish'
 	<%_ if (it.kotlin) { %>
 	id "org.jetbrains.kotlin.jvm" version "<%= it.kotlin.kotlinVersion %>"
@@ -34,7 +34,9 @@ loom {
 }
 <% } %><% if (it.dataGeneration) { %>
 fabricApi {
-	configureDataGeneration()
+	configureDataGeneration {
+		client = true
+	}
 }
 <% } %>
 dependencies {
diff --git a/scripts/src/lib/template/templates/gradle/wrapper/gradle/wrapper/gradle-wrapper.properties b/scripts/src/lib/template/templates/gradle/wrapper/gradle/wrapper/gradle-wrapper.properties
index df97d72b..e2847c82 100644
--- a/scripts/src/lib/template/templates/gradle/wrapper/gradle/wrapper/gradle-wrapper.properties
+++ b/scripts/src/lib/template/templates/gradle/wrapper/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME