Fixed MixinExtras by using JarJar
This commit is contained in:
parent
b684df06fa
commit
1e1324bcde
|
|
@ -30,6 +30,8 @@ if (System.getenv('BUILD_NUMBER') != null) {
|
||||||
version += "." + System.getenv('BUILD_NUMBER')
|
version += "." + System.getenv('BUILD_NUMBER')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
jarJar.enable()
|
||||||
|
|
||||||
archivesBaseName = "${mod_id}-forge-${minecraft_version}"
|
archivesBaseName = "${mod_id}-forge-${minecraft_version}"
|
||||||
|
|
||||||
mixin {
|
mixin {
|
||||||
|
|
@ -100,11 +102,6 @@ minecraft {
|
||||||
|
|
||||||
sourceSets.main.resources.srcDir 'src/generated/resources'
|
sourceSets.main.resources.srcDir 'src/generated/resources'
|
||||||
|
|
||||||
configurations {
|
|
||||||
shade
|
|
||||||
implementation.extendsFrom shade
|
|
||||||
}
|
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
maven {
|
maven {
|
||||||
url 'https://maven.blamejared.com'
|
url 'https://maven.blamejared.com'
|
||||||
|
|
@ -119,7 +116,9 @@ 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")
|
||||||
minecraftLibrary(annotationProcessor(shade(("com.github.LlamaLad7:MixinExtras:${mixinextras_version}"))))
|
minecraftLibrary("com.github.LlamaLad7:MixinExtras:${mixinextras_version}")
|
||||||
|
jarJar(group: 'com.github.LlamaLad7', name: 'MixinExtras', version: "[${mixinextras_version},)")
|
||||||
|
annotationProcessor("com.github.LlamaLad7:MixinExtras:${mixinextras_version}")
|
||||||
//implementation fg.deobf("net.darkhax.gamestages:GameStages-Forge-1.19.2:11.0.2")
|
//implementation fg.deobf("net.darkhax.gamestages:GameStages-Forge-1.19.2:11.0.2")
|
||||||
//implementation fg.deobf("net.darkhax.bookshelf:Bookshelf-Forge-1.19.3:17.0.2")
|
//implementation fg.deobf("net.darkhax.bookshelf:Bookshelf-Forge-1.19.3:17.0.2")
|
||||||
annotationProcessor 'org.spongepowered:mixin:0.8.4-SNAPSHOT:processor'
|
annotationProcessor 'org.spongepowered:mixin:0.8.4-SNAPSHOT:processor'
|
||||||
|
|
@ -135,17 +134,8 @@ dependencies {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
shadowJar {
|
|
||||||
configurations = [project.configurations.shade]
|
|
||||||
relocate 'com.llamalad7.mixinextras', 'tschipp.carryon.shaded.mixinextras'
|
|
||||||
finalizedBy 'reobfShadowJar'
|
|
||||||
archiveClassifier = ""
|
|
||||||
}
|
|
||||||
|
|
||||||
assemble.dependsOn shadowJar
|
|
||||||
|
|
||||||
reobf {
|
reobf {
|
||||||
shadowJar {}
|
jarJar {}
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.withType(JavaCompile) {
|
tasks.withType(JavaCompile) {
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
# Project
|
# Project
|
||||||
version=2.0.4
|
version=2.0.5
|
||||||
group=tschipp.carryon
|
group=tschipp.carryon
|
||||||
|
|
||||||
# Common
|
# Common
|
||||||
|
|
@ -31,4 +31,4 @@ mod_id=carryon
|
||||||
org.gradle.jvmargs=-Xmx3G
|
org.gradle.jvmargs=-Xmx3G
|
||||||
org.gradle.daemon=false
|
org.gradle.daemon=false
|
||||||
|
|
||||||
mixinextras_version=0.2.0-beta.1
|
mixinextras_version=0.1.1
|
||||||
Loading…
Reference in New Issue
Block a user