Skip to content

Commit 8971334

Browse files
Update MDK with new output from mod generator (#14)
* Update MDK with new output from mod generator * Update MDK with new output from mod generator --------- Co-authored-by: NeoForge MDK Automation <173375039+neoforge-mdk-automation[bot]@users.noreply.github.com>
1 parent 0657349 commit 8971334

File tree

3 files changed

+45
-25
lines changed

3 files changed

+45
-25
lines changed

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Disable autocrlf on generated files, they always generate with LF
22
# Add any extra files or paths here to make git stop saying they
33
# are changed when only line endings change.
4-
src/generated/**/.cache/cache text eol=lf
4+
src/generated/**/.cache/* text eol=lf
55
src/generated/**/*.json text eol=lf

.gitignore

Lines changed: 34 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,40 @@
1-
# eclipse
2-
bin
3-
*.launch
4-
.settings
5-
.metadata
6-
.classpath
7-
.project
1+
### Gradle ###
2+
.gradle
3+
build/
4+
!gradle/wrapper/gradle-wrapper.jar
5+
!**/src/**/build/
86

9-
# idea
10-
out
11-
*.ipr
7+
### IntelliJ IDEA ###
8+
.idea/
129
*.iws
1310
*.iml
14-
.idea
11+
*.ipr
12+
out/
13+
!**/src/**/out/
1514

16-
# gradle
17-
build
18-
.gradle
15+
.run/
16+
17+
### Eclipse ###
18+
.apt_generated
19+
.classpath
20+
.eclipse/
21+
.factorypath
22+
.project
23+
.settings
24+
.springBeans
25+
.sts4-cache
26+
bin/
27+
!**/src/**/bin/
28+
29+
### VS Code ###
30+
.vscode/
1931

20-
# other
21-
eclipse
22-
run
23-
runs
24-
run-data
32+
### Mac OS ###
33+
.DS_Store
2534

26-
repo
35+
### Minecraft Modding ###
36+
run/
37+
!**/src/**/run/
38+
**/src/generated/**/.cache/
39+
repo/
40+
!**/src/**/repo/

build.gradle

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
id 'java-library'
33
id 'maven-publish'
4-
id 'net.neoforged.gradle.userdev' version '7.1.20'
4+
id 'net.neoforged.gradle.userdev' version '7.1.21'
55
}
66

77
tasks.named('wrapper', Wrapper).configure {
@@ -16,6 +16,15 @@ tasks.named('wrapper', Wrapper).configure {
1616
version = mod_version
1717
group = mod_group_id
1818

19+
sourceSets.main.resources {
20+
// Include resources generated by data generators.
21+
srcDir('src/generated/resources')
22+
23+
// Exclude common development only resources from finalized outputs
24+
exclude("**/*.bbmodel") // BlockBench project files
25+
exclude("src/generated/**/.cache") // datagen cache files
26+
}
27+
1928
repositories {
2029
// Add here additional repositories if required by some of the dependencies below.
2130
}
@@ -76,9 +85,6 @@ runs {
7685
}
7786
}
7887

79-
// Include resources generated by data generators.
80-
sourceSets.main.resources { srcDir 'src/generated/resources' }
81-
8288
// Sets up a dependency configuration called 'localRuntime'.
8389
// This configuration should be used instead of 'runtimeOnly' to declare
8490
// a dependency that will be present for runtime testing but that is

0 commit comments

Comments
 (0)