originscompat dev (bigger PITA)

Cadiboo · Jun 14, 2024 · a1d89ce · a1d89ce
1 parent df16d45
commit a1d89ce
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/forge/build.gradle b/forge/build.gradle
@@ -58,10 +58,10 @@ minecraft {
 	}
 }
 
+// Need this here so minecraft loads our libraries in dev
+// See https://github.com/MinecraftForge/MinecraftForge/issues/8240#issuecomment-984621976
 configurations {
 	library
-	implementation.extendsFrom library
-	shadow.extendsFrom library
 }
 minecraft.runs.all {
 	lazyToken('minecraft_classpath') {
@@ -74,12 +74,16 @@ dependencies {
 	testImplementation(compileOnly(project(':common')))
 	annotationProcessor('org.spongepowered:mixin:0.8.5-SNAPSHOT:processor')
 
-	library("${rootProject.ext.COLOR_FACTORY}")
-	library(annotationProcessor("${rootProject.ext.MIXIN_EXTRAS}"))
+	library(implementation(shadow("${rootProject.ext.COLOR_FACTORY}")))
+	testCompileOnly(compileOnly(annotationProcessor("${rootProject.ext.MIXIN_EXTRAS}")))
 
-	implementation fg.deobf('curse.maven:Embeddium-908741:5265338') // embeddium-0.3.14+mc1.20.1.jar
-	implementation fg.deobf('curse.maven:Oculus-581495:5108615') // oculus-mc1.20.1-1.6.15a.jar
-	implementation fg.deobf('curse.maven:DistantHorizons-508933:4924664') // DistantHorizons-2.0.1-a-1.20.1.jar
+//	library("${rootProject.ext.COLOR_FACTORY}")
+//	library(annotationProcessor("${rootProject.ext.MIXIN_EXTRAS}"))
+
+//	implementation fg.deobf('curse.maven:Embeddium-908741:5410220') // embeddium-0.3.20+mc1.20.1.jar
+	compileOnly fg.deobf('curse.maven:Embeddium-908741:5265338') // embeddium-0.3.14+mc1.20.1.jar
+//	implementation fg.deobf('curse.maven:Oculus-581495:5108615') // oculus-mc1.20.1-1.6.15a.jar
+//	implementation fg.deobf('curse.maven:DistantHorizons-508933:4924664') // DistantHorizons-2.0.1-a-1.20.1.jar
 	implementation fg.deobf('curse.maven:Origins-474438:5314209') // origins-forge-1.20.1-1.10.0.9-all.jar
 	implementation fg.deobf('curse.maven:Caelus-308989:5281700') // caelus-forge-3.2.0+1.20.1.jar
 }