summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitattributes2
-rw-r--r--.gitignore54
-rw-r--r--build.gradle12
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 bd815c0..e4b0e34 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,6 +17,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.
}
@@ -100,9 +109,6 @@ neoForge {
}
}
-// 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