diff --git a/README.md b/README.md index 9035bbe..2e64fb3 100644 --- a/README.md +++ b/README.md @@ -42,4 +42,4 @@ This mod also adds controller support. ## Build -Just do `./gradlew :fabric:build` and everything should build just fine! +Just do `./gradlew :fabric:shadowRemapJar` and everything should build just fine! diff --git a/core/build.gradle b/core/build.gradle index 316166e..9d1e827 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -8,8 +8,6 @@ archivesBaseName = project.archives_base_name + "-core" dependencies { api "org.jetbrains:annotations:17.0.0" api "org.aperlambda:lambdajcommon:1.8.0" - api "com.electronwill.night-config:core:3.5.3" - api "com.electronwill.night-config:toml:3.5.3" } java { diff --git a/fabric/build.gradle b/fabric/build.gradle index 3276186..6db63be 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -33,7 +33,9 @@ repositories { } configurations { + shadowInternal shadow + api.extendsFrom shadow } dependencies { @@ -54,8 +56,9 @@ dependencies { modImplementation "me.shedaniel:RoughlyEnoughItems:4.5.5" api project(":core") - shadow project(":core") - shadow("org.aperlambda:lambdajcommon:1.8.0") { + shadowInternal project(":core") + shadow("org.aperlambda:lambdajcommon:1.8.0") { + // Minecraft already has all that google crap. exclude group: 'com.google.code.gson' exclude group: 'com.google.guava' } @@ -85,14 +88,6 @@ java { jar { from "../LICENSE" - - from { - configurations.shadow.filter { - it.getName().contains("lambdacontrols") - }.collect { - it.isDirectory() ? it : zipTree(it) - } - } } task shadowJar(type: Jar) { @@ -100,6 +95,13 @@ task shadowJar(type: Jar) { from sourceSets.main.output + from { + configurations.shadowInternal.filter { + it.getName().contains("lambdacontrols") + }.collect { + it.isDirectory() ? it : zipTree(it) + } + } from { configurations.shadow.collect { it.isDirectory() ? it : zipTree(it)