Janky fix for resources

Noxcrew · Nov 25, 2024 · 11ad437 · 11ad437
1 parent c80256e
commit 11ad437
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 1 deletion.
diff --git a/buildSrc/src/main/kotlin/multiloader.loader.gradle.kts b/buildSrc/src/main/kotlin/multiloader.loader.gradle.kts
@@ -18,13 +18,23 @@ dependencies {
 }
 
 tasks {
+    // Janky task to just copy over the resources folder
+    val copyResourcesFromCommon by tasks.registering(Copy::class) {
+        from(project(":common").file("src/main/resources"))
+        into("src/main/resources")
+        include("**/*")
+        duplicatesStrategy = DuplicatesStrategy.INCLUDE
+    }
+
     named<JavaCompile>("compileJava").configure {
         dependsOn(configurations.getByName("commonJava"))
         source(configurations.getByName("commonJava"))
     }
     named<ProcessResources>("processResources").configure {
+        dependsOn(copyResourcesFromCommon)
         dependsOn(configurations.getByName("commonResources"))
         from(configurations.getByName("commonResources"))
+        duplicatesStrategy = DuplicatesStrategy.INCLUDE
     }
     named<Jar>("sourcesJar").configure {
         dependsOn(configurations.getByName("commonJava"))

diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts
@@ -47,4 +47,4 @@ tasks {
             exclude("**/modmenu/**.java")
         }
     }
-}
+}
diff --git a/fabric/src/main/resources/.gitignore b/fabric/src/main/resources/.gitignore
@@ -0,0 +1,5 @@
+*.cfg
+*.accesswidener
+assets
+data
+noxesium-common.mixins.json
diff --git a/neoforge/src/main/resources/.gitignore b/neoforge/src/main/resources/.gitignore
@@ -0,0 +1,5 @@
+*.cfg
+*.accesswidener
+assets
+data
+noxesium-common.mixins.json
-Original file line number
+Diff line change
@@ Expand Up / @@ -47,4 +47,4 @@ tasks { @@
                 exclude("**/modmenu/**.java")
             }
         }
-    }
+    }