fixed build pipeline (hopefully)
This commit is contained in:
parent
9a5b09136f
commit
d3ab092d4f
|
|
@ -33,6 +33,7 @@ mixin {
|
||||||
}
|
}
|
||||||
|
|
||||||
jarJar.enable()
|
jarJar.enable()
|
||||||
|
build.dependsOn tasks.jarJar
|
||||||
|
|
||||||
minecraft {
|
minecraft {
|
||||||
mappings channel: 'parchment', version: "${parchment_mappings}"
|
mappings channel: 'parchment', version: "${parchment_mappings}"
|
||||||
|
|
@ -105,25 +106,28 @@ repositories {
|
||||||
dependencies {
|
dependencies {
|
||||||
minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
|
minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
|
||||||
compileOnly project(":Common")
|
compileOnly project(":Common")
|
||||||
compileOnly(annotationProcessor("io.github.llamalad7:mixinextras-common:${mixinextras_version}"))
|
|
||||||
implementation(annotationProcessor("io.github.llamalad7:mixinextras-forge:${mixinextras_version}"))
|
|
||||||
jarJar(group: 'io.github.llamalad7', name: 'mixinextras-forge', version: "[${mixinextras_version},)")
|
|
||||||
|
|
||||||
//implementation fg.deobf("net.darkhax.gamestages:GameStages-Forge-1.19.2:11.0.2")
|
|
||||||
annotationProcessor 'org.spongepowered:mixin:0.8.5-SNAPSHOT:processor'
|
annotationProcessor 'org.spongepowered:mixin:0.8.5-SNAPSHOT:processor'
|
||||||
|
// Hack fix for now, force jopt-simple to be exactly 5.0.4 because Mojang ships that version, but some transitive dependencies request 6.0+
|
||||||
|
implementation('net.sf.jopt-simple:jopt-simple:5.0.4') { version { strictly '5.0.4' } }
|
||||||
|
|
||||||
fileTree("libs").matching {
|
testCompileOnly(compileOnly(annotationProcessor("io.github.llamalad7:mixinextras-common:${mixinextras_version}")))
|
||||||
include "*.jar"
|
implementation(jarJar("io.github.llamalad7:mixinextras-forge:${mixinextras_version}")) {
|
||||||
}.each {
|
jarJar.ranged(it, "[${mixinextras_version},)")
|
||||||
String filename = it.getName();
|
|
||||||
filename = filename.substring(0, filename.length() - 4);
|
|
||||||
int lastDash = filename.lastIndexOf("-");
|
|
||||||
filename = filename.substring(0, lastDash) + ":" + filename.substring(lastDash+1, filename.length());
|
|
||||||
implementation fg.deobf("blank:${filename}")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Hack fix for now, force jopt-simple to be exactly 5.0.4 because Mojang ships that version, but some transitive dependencies request 6.0+
|
//implementation fg.deobf("net.darkhax.gamestages:GameStages-Forge-1.19.2:11.0.2")
|
||||||
implementation('net.sf.jopt-simple:jopt-simple:5.0.4') { version { strictly '5.0.4' } }
|
|
||||||
|
fileTree("libs").matching {
|
||||||
|
include "*.jar"
|
||||||
|
}.each {
|
||||||
|
String filename = it.getName();
|
||||||
|
filename = filename.substring(0, filename.length() - 4);
|
||||||
|
int lastDash = filename.lastIndexOf("-");
|
||||||
|
filename = filename.substring(0, lastDash) + ":" + filename.substring(lastDash+1, filename.length());
|
||||||
|
implementation fg.deobf("blank:${filename}")
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.withType(JavaCompile).configureEach {
|
tasks.withType(JavaCompile).configureEach {
|
||||||
|
|
@ -140,6 +144,7 @@ processResources {
|
||||||
from project(":Common").sourceSets.main.resources
|
from project(":Common").sourceSets.main.resources
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
publishing {
|
publishing {
|
||||||
publications {
|
publications {
|
||||||
mavenJava(MavenPublication) {
|
mavenJava(MavenPublication) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user