diff --git a/build.gradle.kts b/build.gradle.kts index 6533c8e0d..88b8b4f17 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,6 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import java.util.Date import java.text.SimpleDateFormat import it.unimi.dsi.fastutil.io.FastByteArrayOutputStream +import org.gradle.kotlin.dsl.accessors.runtime.addDependencyTo val mod_version: String by project val mc_version: String by project @@ -119,6 +120,12 @@ tasks.test { useJUnitPlatform() } +configurations { + create("embeddedLibs") +} + +jarJar.enable() + dependencies { val jupiter_version: String by project val kotlin_for_forge_version: String by project @@ -130,9 +137,17 @@ dependencies { implementation("thedarkcolour:kotlinforforge:$kotlin_for_forge_version") - implementation("ru.dbotthepony.kommons:kommons:$kommons_version") - implementation("ru.dbotthepony.kommons:kommons-gson:$kommons_version") - implementation("ru.dbotthepony.kommons:kommons-guava:$kommons_version") + jarJar("ru.dbotthepony.kommons:kommons:[$kommons_version,)") { setTransitive(false) } + jarJar("ru.dbotthepony.kommons:kommons-gson:[$kommons_version,)") { setTransitive(false) } + jarJar("ru.dbotthepony.kommons:kommons-guava:[$kommons_version,)") { setTransitive(false) } + + implementation("ru.dbotthepony.kommons:kommons:[$kommons_version,)") { setTransitive(false) } + implementation("ru.dbotthepony.kommons:kommons-gson:[$kommons_version,)") { setTransitive(false) } + implementation("ru.dbotthepony.kommons:kommons-guava:[$kommons_version,)") { setTransitive(false) } + + minecraftLibrary("ru.dbotthepony.kommons:kommons:[$kommons_version,)") { setTransitive(false) } + minecraftLibrary("ru.dbotthepony.kommons:kommons-gson:[$kommons_version,)") { setTransitive(false) } + minecraftLibrary("ru.dbotthepony.kommons:kommons-guava:[$kommons_version,)") { setTransitive(false) } compileOnly("yalter.mousetweaks:MouseTweaks:2.23:api") annotationProcessor("org.spongepowered:mixin:${mixin_version}:processor") @@ -331,6 +346,12 @@ fun org.gradle.jvm.tasks.Jar.attachManifest() { tasks.jar.configure { finalizedBy("reobfJar") attachManifest() + archiveClassifier.set("slim") + archiveVersion.set(gitVersion.jarName) +} + +tasks.jarJar.configure { + archiveClassifier.set("") archiveVersion.set(gitVersion.jarName) } diff --git a/gradle.properties b/gradle.properties index 3d43496b2..f8f2d4aae 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,7 +19,7 @@ forge_version=48.1.0 mixingradle_version=0.7.33 mixin_version=0.8.5 -kommons_version=2.3.2 +kommons_version=2.3.3 jei_version=16.0.0.28 jupiter_version=5.9.2 diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt index a36344d2c..ffaf11717 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt @@ -15,7 +15,7 @@ object MNames { const val ANDROID_CHARGER = "android_charger" const val INFINITE_WATER_SOURCE = "infinite_water_source" const val DEV_CHEST = "dev_chest" - const val MULTIBLOCK_STRUCTURE = "black_hole_generator" + const val MULTIBLOCK_STRUCTURE = "multiblock_structure" const val BLACK_HOLE_GENERATOR = "black_hole_generator" const val MATTER_INJECTOR = "matter_injector" const val ANTIMATTER_INJECTOR = "antimatter_injector"