buildscript: get rid of forgified mc classes from common (stuff broke)

move fast, break stuff

Author: realRobotix

build.gradle.kts

@@ -37,6 +37,13 @@ loom {
         runDir = "../../../run"
         vmArgs("-Dmixin.debug.export=true")
     }
+    runs.configureEach {
+        vmArg("-XX:+AllowEnhancedClassRedefinition")
+        vmArg("-XX:+IgnoreUnrecognizedVMOptions")
+        vmArg("-Dmixin.debug.export=true")
+        vmArg("-Dmixin.env.remapRefMap=true")
+        vmArg("-Dmixin.env.refMapRemappingFile=${projectDir}/build/createSrgToMcp/output.srg")
+    }
 }
 
 dependencies {
@@ -45,19 +52,19 @@ dependencies {
 		officialMojangMappings { nameSyntheticMembers = false }
 		parchment("org.parchmentmc.data:parchment-${minecraftVersion}:${mod.dep("parchment_version")}@zip")
 	})
-    if (stonecutter.eval(minecraftVersion, "<1.21.1")) {
-        "forge"("net.minecraftforge:forge:$minecraftVersion-${mod.dep("forge_loader_version")}")
-    } else {
-        "neoForge"("net.neoforged:neoforge:${mod.dep("neoforge_loader_version")}")
-    }
 
-    //modImplementation("net.fabricmc:fabric-loader:${mod.dep("fabric_loader_version")}")
-    //modImplementation("net.fabricmc.fabric-api:fabric-api:${mod.dep("fabric_api_version")}+${minecraftVersion}")
+    modImplementation("net.fabricmc:fabric-loader:${mod.dep("fabric_loader_version")}")
 
     modImplementation("com.simibubi.create:create-${minecraftVersion}:${mod.dep("create_neoforge_version")}:slim") { isTransitive = false }
-    modImplementation("net.createmod.ponder:Ponder-Common-${minecraftVersion}:${mod.dep("ponder_neoforge_version")}")
-    modCompileOnly("dev.engine-room.flywheel:flywheel-common-mojmap-api-${minecraftVersion}:${mod.dep("flywheel_neoforge_version")}")
-    modCompileOnly("com.tterrag.registrate:Registrate:${mod.dep("registrate_neoforge_version")}")
+    modImplementation("net.createmod.ponder:Ponder-NeoForge-${minecraftVersion}:${mod.dep("ponder_neoforge_version")}")
+    modCompileOnly("dev.engine-room.flywheel:flywheel-neoforge-api-${minecraftVersion}:${mod.dep("flywheel_neoforge_version")}")
+    modRuntimeOnly("dev.engine-room.flywheel:flywheel-neoforge-${minecraftVersion}:${mod.dep("flywheel_neoforge_version")}")
+    modImplementation("com.tterrag.registrate:Registrate:${mod.dep("registrate_neoforge_version")}")
+
+    compileOnly("net.neoforged.fancymodloader:loader:9.0.18")
+    compileOnly("net.neoforged:neoforge:${mod.dep("neoforge_loader_version")}")
+    compileOnly("com.google.code.findbugs:jsr305:3.0.2")
+    modCompileOnly("net.fabricmc.fabric-api:fabric-api:${mod.dep("fabric_api_version")}+${minecraftVersion}")
 
     "io.github.llamalad7:mixinextras-common:${mod.dep("mixin_extras_version")}".let {
         annotationProcessor(it)

gradle.properties

@@ -1,4 +1,3 @@
-loom.platform = neoforge
 org.gradle.jvmargs=-Xmx4G
 org.gradle.parallel=true
 org.gradle.caching=true
@@ -10,19 +9,19 @@ mod.id=createbigcannons
 
 loom.ignoreDependencyLoomVersionValidation=true
 # Mod setup
-deps.fabric_loader_version=0.16.5
+deps.fabric_loader_version=0.16.14
 deps.forge_loader_version=47.3.0
 deps.neoforge_loader_version=21.1.152
 deps.parchment_version=[VERSIONED]
 deps.mixin_extras_version=0.4.1
 
 # Mod Deps
 # Fabric
-deps.fabric_api_version=0.91.0
+deps.fabric_api_version=0.116.4
 # Create - Fabric
 deps.create_fabric_version=[VERSIONED]
 # Create - NeoForge
-deps.create_neoforge_version=6.0.6-98
+deps.create_neoforge_version=6.0.6-104
 deps.ponder_neoforge_version=1.0.56
 deps.registrate_neoforge_version=MC1.21-1.3.0+62
 deps.flywheel_neoforge_version=1.0.4

stonecutter.gradle.kts

@@ -3,8 +3,8 @@ import org.gradle.kotlin.dsl.support.uppercaseFirstChar
 plugins {
 	`maven-publish`
 	id("dev.kikugie.stonecutter")
-	id("dev.architectury.loom") version "1.9.+" apply false
-	id("architectury-plugin") version "3.4.+" apply false
+	id("dev.architectury.loom") version "1.10-SNAPSHOT" apply false
+	id("architectury-plugin") version "3.4-SNAPSHOT" apply false
 	id("com.gradleup.shadow") version "8.3.5" apply false
 }
 stonecutter active "1.21.1" /* [SC] DO NOT EDIT */