diff --git a/addon.gradle b/addon.gradle index ea0c1b6..d65bc06 100644 --- a/addon.gradle +++ b/addon.gradle @@ -47,19 +47,27 @@ minecraft { injectedTags.put("RECOMMENDED_JAVA_ARGS", extraJavaArgs.stream().collect(Collectors.joining("\t"))) } +Configuration forgePatchesEmbeddedRecompile; Configuration forgePatchesEmbedded; Configuration versionJsonElements; configurations { + forgePatchesEmbeddedRecompile = create("forgePatchesEmbeddedRecompile") { + canBeConsumed = false + canBeResolved = true + } forgePatchesEmbedded = create("forgePatchesEmbedded") { canBeConsumed = false canBeResolved = true + extendsFrom(forgePatchesEmbeddedRecompile) } versionJsonElements = create("versionJsonElements") { canBeConsumed = false canBeResolved = false } - patchedMinecraft { extendsFrom(forgePatchesEmbedded) } + patchedMinecraft { extendsFrom(forgePatchesEmbeddedRecompile) } + compileClasspath { extendsFrom(forgePatchesEmbedded) } + runtimeClasspath { extendsFrom(forgePatchesEmbedded) } shadowImplementation } diff --git a/dependencies.gradle b/dependencies.gradle index 4a40b5e..9ac8c5f 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -35,11 +35,12 @@ dependencies { hotswapCompileOnly("org.hotswapagent:hotswap-agent-core:1.4.1") hotswapCompileOnly("com.gtnewhorizons.retrofuturabootstrap:RetroFuturaBootstrap:${rfbVersion}") - forgePatchesEmbedded("org.ow2.asm:asm:${asmVersion}") - forgePatchesEmbedded("org.ow2.asm:asm-commons:${asmVersion}") - forgePatchesEmbedded("org.ow2.asm:asm-tree:${asmVersion}") - forgePatchesEmbedded("org.ow2.asm:asm-analysis:${asmVersion}") - forgePatchesEmbedded("org.ow2.asm:asm-util:${asmVersion}") + forgePatchesEmbeddedRecompile("org.ow2.asm:asm:${asmVersion}") + forgePatchesEmbeddedRecompile("org.ow2.asm:asm-commons:${asmVersion}") + forgePatchesEmbeddedRecompile("org.ow2.asm:asm-tree:${asmVersion}") + forgePatchesEmbeddedRecompile("org.ow2.asm:asm-analysis:${asmVersion}") + forgePatchesEmbeddedRecompile("org.ow2.asm:asm-util:${asmVersion}") + forgePatchesEmbedded("org.apache.commons:commons-lang3:3.14.0") forgePatchesEmbedded("org.apache.commons:commons-compress:1.26.0") forgePatchesEmbedded("commons-io:commons-io:2.15.1")