Clean up gradle setup

build.gradle

@@ -1,3 +1,5 @@
+import java.util.stream.Collectors
+
 plugins {
     id "architectury-plugin" version "2.0.65"
     id "forgified-fabric-loom" version "0.6.59" apply false
@@ -10,8 +12,19 @@ architectury {
 subprojects {
     apply plugin: "forgified-fabric-loom"
 
+    def fcMixinConfigs = [
+            "predicates",
+            "fastmap",
+            "nopropertymap",
+            "mrl",
+            "dedupmultipart",
+            "blockstatecache",
+        ].stream()
+        .map({s -> rootProject.archives_base_name+"."+s+".mixin.json"})
+        .collect(Collectors.toList())
     loom {
         silentMojangMappingsLicense()
+        mixinConfigs += fcMixinConfigs
     }
 }
 
@@ -26,12 +39,8 @@ allprojects {
     tasks.withType(JavaCompile) {
         options.encoding = "UTF-8"
 
-        // The Minecraft launcher currently installs Java 8 for users, so your mod probably wants to target Java 8 too
-        // JDK 9 introduced a new way of specifying this that will make sure no newer classes or methods are used.
-        // We'll use that if it's available, but otherwise we'll use the older option.
-        def targetVersion = 8
         if (JavaVersion.current().isJava9Compatible()) {
-            options.release = targetVersion
+            options.release = 8
         }
     }
 

common/build.gradle

@@ -10,5 +10,6 @@ dependencies {
 }
 
 architectury {
+    injectInjectables = false
     common()
 }

fabric/build.gradle

@@ -1,5 +1,3 @@
-import java.util.stream.Collectors
-
 plugins {
     id "com.github.johnrengelman.shadow" version "5.0.0"
 }
@@ -48,10 +46,6 @@ remapJar {
     classifier "fabric"
 }
 
-def fcMixinConfigs = ["predicates", "fastmap", "nopropertymap", "mrl", "dedupmultipart", "blockstatecache"].stream()
-        .map({s -> archivesBaseName+"."+s+".mixin.json"})
-        .collect(Collectors.toList())
-
 loom {
-    mixinConfigs = fcMixinConfigs
+    mixinConfigs += "ferritecore.fabric.mixin.json"
 }

forge/build.gradle

@@ -1,5 +1,3 @@
-import java.util.stream.Collectors
-
 plugins {
     id "com.github.johnrengelman.shadow" version "5.0.0"
 }
@@ -48,12 +46,3 @@ remapJar {
     input.set(shadowJar.archivePath)
     classifier "forge"
 }
-
-//TODO this is also in the other build.gradle…
-def fcMixinConfigs = ["predicates", "fastmap", "nopropertymap", "mrl", "dedupmultipart", "blockstatecache"].stream()
-        .map({s -> archivesBaseName+"."+s+".mixin.json"})
-        .collect(Collectors.toList())
-
-loom {
-    mixinConfigs = fcMixinConfigs
-}

forge/src/main/java/malte0811/ferritecore/ModClientForge.java

@@ -3,10 +3,12 @@ package malte0811.ferritecore;
 import malte0811.ferritecore.impl.Deduplicator;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.ParticleFactoryRegisterEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 
 @Mod.EventBusSubscriber(value = Dist.CLIENT, modid = ModMain.MODID, bus = Mod.EventBusSubscriber.Bus.MOD)
 public class ModClientForge {
+    @SubscribeEvent
     public static void registerReloadListener(ParticleFactoryRegisterEvent ev) {
         Deduplicator.registerReloadListener();
     }

gradle.properties

@@ -1,4 +1,5 @@
 org.gradle.jvmargs=-Xmx2048M
+org.gradle.daemon=false
 
 minecraft_version=1.16.5