malte0811 3 жил өмнө
parent
commit
5cda8bf0b1

+ 2 - 14
build.gradle

@@ -1,8 +1,8 @@
 import java.util.stream.Collectors
 
 plugins {
-    id "architectury-plugin" version "3.3-SNAPSHOT"
-    id "dev.architectury.loom" version "0.7.4-SNAPSHOT" apply false
+    id "architectury-plugin" version "3.4-SNAPSHOT"
+    id "dev.architectury.loom" version "0.10.0-SNAPSHOT" apply false
 }
 
 architectury {
@@ -12,20 +12,8 @@ architectury {
 subprojects {
     apply plugin: "dev.architectury.loom"
 
-    def fcMixinConfigs = [
-            "predicates",
-            "fastmap",
-            "mrl",
-            "dedupmultipart",
-            "blockstatecache",
-            "dedupbakedquad",
-            "chunknbt",
-        ].stream()
-        .map({s -> rootProject.archives_base_name+"."+s+".mixin.json"})
-        .collect(Collectors.toList())
     loom {
         silentMojangMappingsLicense()
-        mixinConfigs += fcMixinConfigs
     }
 
     task signJar(description: "Sign jar") {

+ 8 - 0
common/build.gradle

@@ -59,3 +59,11 @@ jar {
 test {
     useJUnitPlatform()
 }
+
+configurations {
+    dev
+}
+
+artifacts {
+    dev(jar)
+}

+ 2 - 6
fabric/build.gradle

@@ -14,10 +14,10 @@ architectury {
 dependencies {
     modImplementation("net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}")
 
-    implementation(project(path: ":common")) {
+    implementation(project(path: ":common", configuration: "dev")) {
         transitive = false
     }
-    developmentFabric(project(path: ":common")) {
+    developmentFabric(project(path: ":common", configuration: "dev")) {
         transitive = false
     }
     shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) {
@@ -47,7 +47,3 @@ remapJar {
 jar {
     classifier "dev"
 }
-
-loom {
-    mixinConfigs += "ferritecore.fabric.mixin.json"
-}

+ 18 - 6
forge/build.gradle

@@ -1,3 +1,5 @@
+import java.util.stream.Collectors
+
 plugins {
     id "com.github.johnrengelman.shadow" version "7.0.0"
 }
@@ -11,20 +13,30 @@ architectury {
     forge()
 }
 
-repositories {
-    maven { // Mixins for early 1.17
-        url 'https://repo.spongepowered.org/repository/maven-public/'
+loom {
+    forge {
+        def fcMixinConfigs = [
+                "predicates",
+                "fastmap",
+                "mrl",
+                "dedupmultipart",
+                "blockstatecache",
+                "dedupbakedquad",
+                "chunknbt",
+        ].stream()
+                .<String>map({s -> "ferritecore."+s+".mixin.json"})
+                .collect(Collectors.toList())
+        mixinConfigs.addAll(fcMixinConfigs)
     }
 }
 
 dependencies {
     forge("net.minecraftforge:forge:${rootProject.minecraft_version}-${rootProject.forge_version}")
-    compileOnly 'org.spongepowered:mixin:0.8.4-SNAPSHOT'
 
-    implementation(project(path: ":common")) {
+    implementation(project(path: ":common", configuration: "dev")) {
         transitive = false
     }
-    developmentForge(project(path: ":common")) {
+    developmentForge(project(path: ":common", configuration: "dev")) {
         transitive = false
     }
     shadowCommon(project(path: ":common", configuration: "transformProductionForge")) {