From 589c40b5ef499911d50c6aa840e352bbe14ab2de Mon Sep 17 00:00:00 2001 From: NeoForge MDK Automation <173375039+neoforge-mdk-automation[bot]@users.noreply.github.com> Date: Thu, 12 Mar 2026 20:04:06 +0000 Subject: [PATCH 1/2] Update MDK with new output from mod generator --- .gitattributes | 2 +- .gitignore | 54 +++++++++++++++++++++++++++++++------------------- build.gradle | 12 ++++++++--- 3 files changed, 44 insertions(+), 24 deletions(-) diff --git a/.gitattributes b/.gitattributes index f811f6a..b7bbcc4 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1,5 @@ # Disable autocrlf on generated files, they always generate with LF # Add any extra files or paths here to make git stop saying they # are changed when only line endings change. -src/generated/**/.cache/cache text eol=lf +src/generated/**/.cache/* text eol=lf src/generated/**/*.json text eol=lf diff --git a/.gitignore b/.gitignore index 31d2550..fee2f7b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,26 +1,40 @@ -# eclipse -bin -*.launch -.settings -.metadata -.classpath -.project +### Gradle ### +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/**/build/ -# idea -out -*.ipr +### IntelliJ IDEA ### +.idea/ *.iws *.iml -.idea +*.ipr +out/ +!**/src/**/out/ -# gradle -build -.gradle +.run/ + +### Eclipse ### +.apt_generated +.classpath +.eclipse/ +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/**/bin/ + +### VS Code ### +.vscode/ -# other -eclipse -run -runs -run-data +### Mac OS ### +.DS_Store -repo \ No newline at end of file +### Minecraft Modding ### +run/ +!**/src/**/run/ +**/src/generated/**/.cache/ +repo/ +!**/src/**/repo/ diff --git a/build.gradle b/build.gradle index 6735126..189303d 100644 --- a/build.gradle +++ b/build.gradle @@ -16,6 +16,15 @@ tasks.named('wrapper', Wrapper).configure { version = mod_version group = mod_group_id +sourceSets.main.resources { + // Include resources generated by data generators. + srcDir('src/generated/resources') + + // Exclude common development only resources from finalized outputs + exclude("**/*.bbmodel") // BlockBench project files + exclude("src/generated/**/.cache") // datagen cache files +} + repositories { // Add here additional repositories if required by some of the dependencies below. } @@ -76,9 +85,6 @@ runs { } } -// Include resources generated by data generators. -sourceSets.main.resources { srcDir 'src/generated/resources' } - // Sets up a dependency configuration called 'localRuntime'. // This configuration should be used instead of 'runtimeOnly' to declare // a dependency that will be present for runtime testing but that is From 414dd40c2f8186386c35475130a8a058a320131c Mon Sep 17 00:00:00 2001 From: NeoForge MDK Automation <173375039+neoforge-mdk-automation[bot]@users.noreply.github.com> Date: Fri, 13 Mar 2026 08:04:07 +0000 Subject: [PATCH 2/2] Update MDK with new output from mod generator --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 189303d..8d8a1e5 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java-library' id 'maven-publish' - id 'net.neoforged.gradle.userdev' version '7.1.20' + id 'net.neoforged.gradle.userdev' version '7.1.21' } tasks.named('wrapper', Wrapper).configure {