switched to multiloader setup, currently untested

build.gradle

@@ -1,65 +1,43 @@
+import org.gradle.api.tasks.compile.JavaCompile
+import org.gradle.jvm.toolchain.JavaLanguageVersion
 plugins {
     id "maven-publish"
-    id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.7-SNAPSHOT" apply(false)
-    id "com.github.johnrengelman.shadow" version "7.0.0" apply(false)
-    id 'org.jetbrains.kotlin.jvm' version '1.8.21'
-    id 'org.jetbrains.kotlin.plugin.lombok' version '2.0.20'
-}
-
-architectury {
-    minecraft = rootProject.minecraft_version
+    id "idea"
+    // Adds the Kotlin Gradle plugin
+    id 'org.jetbrains.kotlin.jvm' version "${kotlin_version}" apply false
+    id 'org.jetbrains.kotlin.plugin.lombok' version '2.0.20' apply false
+    id "io.freefair.lombok" version "8.10.2" apply false
+    id "fabric-loom" version "1.7-SNAPSHOT" apply false
+    id "net.neoforged.moddev.legacyforge" version "2.0.58-beta" apply false
 }
 
 //Print out JVM information so that we know what version is running. Extreamly useful for people to know when helping you.
 println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
 
 def isCI = System.getenv("GITHUB_ACTION")
-def isRELEASE = System.getenv("GITHUB_RELEASE")
-
 def gitHash() {
     String hash = System.getenv("GITHUB_SHA")
     if (hash != null) return hash.substring(0,8)
     return ""
 }
 
 subprojects {
-    apply plugin: "dev.architectury.loom"
+    apply plugin: "maven-publish"
+    apply plugin: "java"
+    apply plugin: "idea"
     apply plugin: "org.jetbrains.kotlin.jvm"
     apply plugin: "org.jetbrains.kotlin.plugin.lombok"
+    apply plugin: "io.freefair.lombok"
+    group = rootProject.maven_group
+    version = "${project.mod_version}-${rootProject.minecraft_version}"
     java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 
-    loom {
-        silentMojangMappingsLicense()
-    }
-
-    dependencies {
-        minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
-        // The following line declares the mojmap mappings, you may use other mappings as well
-        mappings loom.layered() {
-            officialMojangMappings()
-            parchment("org.parchmentmc.data:parchment-${rootProject.minecraft_version}:${rootProject.mappings_version}@zip")
-        }
-        // The following line declares the yarn mappings you may select this one as well.
-        // mappings "net.fabricmc:yarn:1.17.1+build.32:v2"
-    }
-
-    processResources {
-        exclude('gtuassets1.14')
-    }
     compileKotlin {
         kotlinOptions.jvmTarget = "17"
     }
-}
-
-allprojects {
-    apply plugin: "maven-publish"
-    apply plugin: "java"
-    apply plugin: "architectury-plugin"
-    apply from: 'https://raw.githubusercontent.com/GregTech-Intergalactical/GradleSripts/main/repositories.gradle'
 
 
-    group = rootProject.maven_group
+    apply from: 'https://raw.githubusercontent.com/GregTech-Intergalactical/GradleSripts/main/repositories.gradle'
 
     java {
         withSourcesJar()
@@ -73,43 +51,4 @@ allprojects {
         version = version + "-" + gitHash()
         println("In CI mode")
     }
-}
-
-subprojects{
-    if (!project.path.contains("common")){
-        apply plugin: "com.github.johnrengelman.shadow"
-
-        configurations {
-            common
-            shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this.
-            compileClasspath.extendsFrom common
-            runtimeClasspath.extendsFrom common
-            if (project.path.contains("forge")){
-                developmentForge.extendsFrom common
-            } else{
-                developmentFabric.extendsFrom common
-            }
-        }
-
-        shadowJar {
-            configurations = [project.configurations.shadowCommon]
-            archiveClassifier.set "dev-shadow"
-        }
-
-        remapJar {
-            input.set shadowJar.archiveFile
-            dependsOn shadowJar
-            archiveClassifier.set null
-        }
-
-        jar {
-            archiveClassifier.set "dev"
-        }
-
-        components.java {
-            withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
-                skip()
-            }
-        }
-    }
-}
+}

common/build.gradle

@@ -1,38 +1,50 @@
+plugins {
+    id "fabric-loom"
+    id 'xyz.wagyourtail.unimined.expect-platform' version '1.0.5'
+}
 archivesBaseName = "${rootProject.archive_base_name}-common"
-version = "${project.mod_version}-${rootProject.minecraft_version}"
+
+def accessWidenerFile = project(":antimatter-common").file("src/main/resources/antimatter.accesswidener")
 
 loom {
-    accessWidenerPath = file("../AntimatterAPI/common/src/main/resources/antimatter.accesswidener")
+    accessWidenerPath = accessWidenerFile
 }
 
 
 dependencies{
-    modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
-    compileOnly("com.blamejared.crafttweaker:CraftTweaker-common-1.18.2:${rootProject.crafttweaker_version}")
-    modCompileOnly("dev.latvian.mods:kubejs-fabric:${rootProject.kubejs_version}")
-    implementation(annotationProcessor("io.github.llamalad7:mixinextras-common:0.2.0-beta.11"))
-    implementation(project(path: ":tesseract-common", configuration: "namedElements"))
-    implementation(project(path: ":antimatter-common", configuration: "namedElements"))
-    implementation("org.gt-reimagined:gtcore-common:${rootProject.gt_core_version}-${rootProject.minecraft_version}"){
-        transitive = false
+    minecraft "com.mojang:minecraft:${project.minecraft_version}"
+    mappings loom.layered() {
+        officialMojangMappings()
+        parchment("org.parchmentmc.data:parchment-${project.minecraft_version}:${project.mappings_version}@zip")
     }
-    modImplementation("com.gtnewhorizon.structurelib:structurelib-common:${project.structurelib_version}-${project.minecraft_version}")
-    modImplementation("io.github.fabricators_of_create:Porting-Lib:${rootProject.port_lib_version}-beta+1.18.2-stable"){
+    implementation(expectPlatform.annotationsDep)
+
+    //subprojects
+    implementation(project(path: ":tesseract-common"))
+    implementation(project(path: ":antimatter-common"))
+
+    //gt-reimagined-lib deps
+    compileOnly("com.blamejared.crafttweaker:CraftTweaker-common-1.18.2:${project.crafttweaker_version}")
+    modCompileOnly("dev.latvian.mods:kubejs-fabric:${project.kubejs_version}")
+    modImplementation("io.github.fabricators_of_create:Porting-Lib:${project.port_lib_version}-beta+1.18.2-stable"){
         exclude(group: "net.fabricmc.fabric-api")
         exclude(group: "com.github.LlamaLad7")
     }
-    modImplementation "com.teamresourceful.resourcefullib:resourcefullib-common-1.18.2:${project.resourcefullib_version}"
     modImplementation("net.feltmc:felt-player-item-api:1.1.0"){
         transitive = false
     }
     modImplementation("net.feltmc:felt-enchanting-api:1.1.0") { transitive false }
-    modImplementation("earth.terrarium:botarium-common-1.18.2:${project.botarium_version}")
-    modImplementation "maven.modrinth:carbon-config:${project.carbon_config_fabric_version}"
+    implementation(annotationProcessor("io.github.llamalad7:mixinextras-common:0.4.1"))
+    modCompileOnly "me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}"
+    modCompileOnly("mezz.jei:jei-${project.minecraft_version}-fabric:${project.jei_version}")
     modCompileOnly("dev.trinsdar:arrp:0.6.7")
-    modCompileOnly "me.shedaniel:RoughlyEnoughItems-api:${rootProject.rei_version}"
-    modCompileOnly("mezz.jei:jei-${rootProject.minecraft_version}-common-api:${rootProject.jei_version}")
-}
+    implementation("org.gt-reimagined:structurelib-common:${project.structurelib_version}-${project.minecraft_version}")
+    modImplementation "maven.modrinth:carbon-config:${project.carbon_config_fabric_version}"
+    modImplementation("earth.terrarium:botarium-common-1.18.2:${project.botarium_version}")
+    modImplementation "com.teamresourceful.resourcefullib:resourcefullib-common-1.18.2:${project.resourcefullib_version}"
 
-architectury {
-    common("forge", "fabric")
-}
+    //gt5r deps
+    implementation("org.gt-reimagined:gtcore-common:${project.gt_core_version}-${project.minecraft_version}"){
+        transitive = false
+    }
+}

common/gradle.properties

@@ -0,0 +1 @@
+fabric.loom.dontRemap=true

fabric/build.gradle

@@ -1,35 +1,32 @@
-archivesBaseName = "${rootProject.archive_base_name}-fabric"
-version = "${project.mod_version}-${rootProject.minecraft_version}"
+import org.gradle.api.tasks.compile.JavaCompile
+
+plugins {
+    id "fabric-loom"
+    id 'xyz.wagyourtail.unimined.expect-platform' version '1.0.5'
+}
+archivesBaseName = "${project.archive_base_name}-fabric"
 
-def generatedResources = file("src/generated/resources")
 def accessWidenerFile = project(":antimatter-common").file("src/main/resources/antimatter.accesswidener")
 
 loom {
     accessWidenerPath = accessWidenerFile
 }
 
-repositories {
-    maven {
-        url = uri("https://storage.googleapis.com/devan-maven/")
-    }
-}
-
-sourceSets {
-    main {
-        resources {
-            srcDir generatedResources
-        }
-    }
-}
-
 dependencies{
-    modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
-    modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}"
-    common(project(path: ":tesseract-common", configuration: "namedElements")) { transitive false }
-    common(project(path: ":antimatter-common", configuration: "namedElements")) { transitive false }
-    implementation(project(path: ":tesseract-fabric", configuration: "namedElements")) { transitive false }
-    implementation(project(path: ":antimatter-fabric", configuration: "namedElements"))
-    modImplementation("io.github.fabricators_of_create:Porting-Lib:${rootProject.port_lib_version}-beta+1.18.2-stable"){
+    minecraft "com.mojang:minecraft:${project.minecraft_version}"
+    mappings loom.layered() {
+        officialMojangMappings()
+        parchment("org.parchmentmc.data:parchment-${project.minecraft_version}:${project.mappings_version}@zip")
+    }
+    implementation(expectPlatform.annotationsDep)
+    modImplementation "net.fabricmc:fabric-loader:${project.fabric_loader_version}"
+    modApi "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
+    implementation(project(path: ":tesseract-common")) { transitive false }
+    implementation(project(path: ":tesseract-fabric")) { transitive false }
+    implementation(project(path: ":antimatter-common")) { transitive false }
+    implementation(project(path: ":antimatter-fabric")) { transitive false }
+    compileOnly(project(":common"))
+    modImplementation("io.github.fabricators_of_create:Porting-Lib:${project.port_lib_version}-beta+1.18.2-stable"){
         exclude(group: "net.fabricmc.fabric-api")
         exclude(group: "com.github.LlamaLad7")
     }
@@ -42,15 +39,8 @@ dependencies{
         exclude(group: "com.terraformersmc")
     }
     modImplementation("net.feltmc:felt-enchanting-api:1.1.0") { transitive false }
-    common(project(path: ":common", configuration: "namedElements")) { transitive false }
-    shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }
     modImplementation("dev.trinsdar:arrp:0.6.7")
-    include("org.gt-reimagined:gtcore-fabric:${rootProject.gt_core_version}-${rootProject.minecraft_version}")
-    modImplementation(include("org.gt-reimagined:gtcore-fabric:${rootProject.gt_core_version}-${rootProject.minecraft_version}")){
-        transitive = false
-    }
-    modImplementation("com.terraformersmc.terraform-api:terraform-wood-api-v1:3.1.0")
-    modRuntimeOnly("com.gtnewhorizon.structurelib:structurelib-fabric:${project.structurelib_version}-${project.minecraft_version}")
+    modRuntimeOnly("org.gt-reimagined:structurelib-fabric:${project.structurelib_version}-${project.minecraft_version}")
     modRuntimeOnly "me.shedaniel:RoughlyEnoughItems-fabric:${rootProject.rei_version}"
     modCompileOnly("mezz.jei:jei-${rootProject.minecraft_version}-fabric:${rootProject.jei_version}"){
         exclude(group: "mezz.jei", module: "jei-1.18.2-fabric-api")
@@ -65,23 +55,21 @@ dependencies{
     modImplementation("earth.terrarium:botarium-fabric-1.18.2:${project.botarium_version}"){
         transitive = false
     }
-    modRuntimeOnly("curse.maven:energizedpower-782147:4567261")
     modImplementation("com.teamresourceful.resourcefullib:resourcefullib-fabric-1.18.2:${project.resourcefullib_version}")
-    modRuntimeOnly("dev.latvian.mods:kubejs-fabric:${rootProject.kubejs_version}")
-    //modImplementation("curse.maven:ctm-refabricated-633997:3834064")
-}
+    modRuntimeOnly("dev.latvian.mods:kubejs-fabric:${project.kubejs_version}")
 
-architectury {
-    fabric()
-}
+    modImplementation(include("org.gt-reimagined:gtcore-fabric:${project.gt_core_version}-${project.minecraft_version}")){
+        transitive = false
+    }
+    modImplementation("com.terraformersmc.terraform-api:terraform-wood-api-v1:3.1.0")
+    modRuntimeOnly("curse.maven:energizedpower-782147:4567261")
 
-task copyAccessWidener(type: Copy) {
-    from accessWidenerFile
-    into generatedResources
+    //modImplementation("curse.maven:ctm-refabricated-633997:3834064")
 }
 
 processResources {
-    //dependsOn copyAccessWidener
+    from project(":common").sourceSets.main.resources
+    exclude('gtuassets1.14')
 
     def toReplace = [
             "version"             : project.mod_version
@@ -92,36 +80,31 @@ processResources {
         expand toReplace
     }
 }
+
+tasks.named('compileJava', JavaCompile) {
+    source(project(":common").sourceSets.main.allSource)
+}
+
 sourcesJar {
-    def commonSources = project(":common").sourcesJar
-    dependsOn commonSources
-    from commonSources.archiveFile.map { zipTree(it) }
+    from(project(':common').sourceSets.main.allSource)
 }
 
-/*
-publishing {
-    tasks.publish.dependsOn "build", "reobfJar"
-    publications {
-        mavenJava(org.gradle.api.publish.maven.MavenPublication) {
-            //artifactId = archivesBaseName
-            artifact shadowJar
-        }
-    }
-    repositories {
-        if (rootProject.isCI && rootProject.isRELEASE) {
-            maven {
-                name = "GitHubPackages"
-                url = "https://maven.pkg.github.com/GregTech-Intergalactical/TesseractAPI"
-                credentials {
-                    username = System.getenv("GITHUB_ACTOR")
-                    password = System.getenv("GITHUB_TOKEN")
-                }
-            }
-        } else {
-            maven { url "file:///${project.projectDir}/mcmodsrepo"}
-        }
-    }
-    //repositories {
-    //    rootProject.configurePublishingRepositories(delegate)
-    //}
-}*/
+tasks.create("platformJar", ExpectPlatformJar){
+    platformName = "fabric"
+    inputFiles = sourceSets.main.output
+    archiveClassifier.set "dev"
+    remap = [
+            "xyz/wagyourtail/unimined/expect/annotation/Environment": "net/fabricmc/api/Environment",
+            "xyz/wagyourtail/unimined/expect/annotation/Environment\$EnvType": "net/fabricmc/api/EnvType",
+    ]
+}
+
+remapJar {
+    inputFile.set platformJar.archiveFile
+    dependsOn platformJar
+    archiveClassifier.set null
+}
+
+jar{
+    archiveClassifier.set "dev-unmapped"
+}