Forge finally fixed. Altough manifold is disabled in forge atm
This commit is contained in:
+8
-6
@@ -97,7 +97,7 @@ subprojects { p ->
|
||||
|
||||
// Apply plugins
|
||||
apply plugin: "java"
|
||||
if (isMinecraftSubProject)
|
||||
if (isMinecraftSubProject && p != project(":forge"))
|
||||
apply plugin: "systems.manifold.manifold-gradle-plugin"
|
||||
apply plugin: "com.github.johnrengelman.shadow"
|
||||
// apply plugin: "org.spongepowered.gradle.vanilla" // Provides minecraft libraries
|
||||
@@ -107,9 +107,10 @@ subprojects { p ->
|
||||
|
||||
|
||||
// Set the manifold version (may not be required tough)
|
||||
manifold {
|
||||
manifoldVersion = rootProject.manifold_version
|
||||
}
|
||||
if (p != project(":forge"))
|
||||
manifold {
|
||||
manifoldVersion = rootProject.manifold_version
|
||||
}
|
||||
|
||||
|
||||
// set up custom configurations (configurations are a way to handle dependencies)
|
||||
@@ -148,7 +149,7 @@ subprojects { p ->
|
||||
|
||||
|
||||
// Manifold
|
||||
if (isMinecraftSubProject)
|
||||
if (isMinecraftSubProject && p != project(":forge"))
|
||||
annotationProcessor("systems.manifold:manifold-preprocessor:${rootProject.manifold_version}")
|
||||
|
||||
// Log4j
|
||||
@@ -409,7 +410,8 @@ allprojects { p ->
|
||||
tasks.withType(JavaCompile) {
|
||||
if (isMinecraftSubProject) {
|
||||
options.release = rootProject.java_version as Integer
|
||||
options.compilerArgs += ['-Xplugin:Manifold']
|
||||
if (p != project(":forge"))
|
||||
options.compilerArgs += ['-Xplugin:Manifold']
|
||||
} else {
|
||||
options.release = 8; // Core & Api should use Java 8 no matter what
|
||||
// No it shouldn't cause it fails to find minecraft if it uses Java 8
|
||||
|
||||
+2
-2
@@ -79,8 +79,8 @@ if (gradle.builds_for.contains("fabric"))
|
||||
include("fabric")
|
||||
if (gradle.builds_for.contains("quilt"))
|
||||
include("quilt") // Just put this here for once we need it ;)
|
||||
//if (gradle.builds_for.contains("forge"))
|
||||
// include("forge") // FIXME: Fix forge, its just annoying
|
||||
if (gradle.builds_for.contains("forge"))
|
||||
include("forge")
|
||||
|
||||
|
||||
rootProject.name = "DistantHorizons"
|
||||
|
||||
Reference in New Issue
Block a user