diff --git a/fabric/build.gradle b/fabric/build.gradle
index 7847249c1..c9180eeb1 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -87,6 +87,7 @@ dependencies {
 
     common(project(path: ":common", configuration: "namedElements")) { transitive false }
     shadowMe(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }
+    shadowMe files(project(":core").file("build/libs/DistantHorizons-${rootProject.mod_version}.jar"))
 
     // Compression
     common 'org.tukaani:xz:1.9'
@@ -104,7 +105,8 @@ processResources {
     dependsOn(copyCommonResources)
     dependsOn(copyAccessWidener)
 }
-
+jar.dependsOn(project(":core").remapJar)
+remapSourcesJar.dependsOn(project(":core").remapJar)
 runClient {
     dependsOn(copyCoreResources)
     dependsOn(copyCommonResources)
diff --git a/forge/build.gradle b/forge/build.gradle
index 8f023fda4..ba0e968ad 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -42,6 +42,7 @@ dependencies {
 
     common(project(path: ":common", configuration: "namedElements")) { transitive false }
     shadowMe(project(path: ":common", configuration: "transformProductionForge")) { transitive = false }
+    shadowMe files(project(":core").file("build/libs/DistantHorizons-${rootProject.mod_version}.jar"))
 
 //    forgeDependencies(project(":core")) { transitive false }
 
@@ -61,7 +62,8 @@ processResources {
     dependsOn(copyCoreResources)
     dependsOn(copyCommonResources)
 }
-
+jar.dependsOn(project(":core").remapJar)
+remapSourcesJar.dependsOn(project(":core").remapJar)
 shadowJar {
     dependencies {
         exclude(dependency("net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"))