DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity

Actually add kommons to dependencies

Browse Source
This commit is contained in:
DBotThePony 2024-02-15 19:49:05 +07:00
parent a7fd7fe7e5
commit 22430cd937
Signed by: DBot
GPG Key ID: DCC23B5715498507
3 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
build.gradle.kts
View File

@ -3,6 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import java.util.Date import java.util.Date
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import it.unimi.dsi.fastutil.io.FastByteArrayOutputStream import it.unimi.dsi.fastutil.io.FastByteArrayOutputStream
import org.gradle.kotlin.dsl.accessors.runtime.addDependencyTo
val mod_version: String by project val mod_version: String by project
val mc_version: String by project val mc_version: String by project
@ -119,6 +120,12 @@ tasks.test {
useJUnitPlatform() useJUnitPlatform()
} }
configurations {
create("embeddedLibs")
}
jarJar.enable()
dependencies { dependencies {
val jupiter_version: String by project val jupiter_version: String by project
val kotlin_for_forge_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("thedarkcolour:kotlinforforge:$kotlin_for_forge_version")
implementation("ru.dbotthepony.kommons:kommons:$kommons_version") jarJar("ru.dbotthepony.kommons:kommons:[$kommons_version,)") { setTransitive(false) }
implementation("ru.dbotthepony.kommons:kommons-gson:$kommons_version") jarJar("ru.dbotthepony.kommons:kommons-gson:[$kommons_version,)") { setTransitive(false) }
implementation("ru.dbotthepony.kommons:kommons-guava:$kommons_version") 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") compileOnly("yalter.mousetweaks:MouseTweaks:2.23:api")
annotationProcessor("org.spongepowered:mixin:${mixin_version}:processor") annotationProcessor("org.spongepowered:mixin:${mixin_version}:processor")
@ -331,6 +346,12 @@ fun org.gradle.jvm.tasks.Jar.attachManifest() {
tasks.jar.configure { tasks.jar.configure {
finalizedBy("reobfJar") finalizedBy("reobfJar")
attachManifest() attachManifest()
archiveClassifier.set("slim")
archiveVersion.set(gitVersion.jarName)
}
tasks.jarJar.configure {
archiveClassifier.set("")
archiveVersion.set(gitVersion.jarName) archiveVersion.set(gitVersion.jarName)
} }

2
gradle.properties
View File

@ -19,7 +19,7 @@ forge_version=48.1.0
mixingradle_version=0.7.33 mixingradle_version=0.7.33
mixin_version=0.8.5 mixin_version=0.8.5
kommons_version=2.3.2 kommons_version=2.3.3
jei_version=16.0.0.28 jei_version=16.0.0.28
jupiter_version=5.9.2 jupiter_version=5.9.2

2
src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt
View File

@ -15,7 +15,7 @@ object MNames {
const val ANDROID_CHARGER = "android_charger" const val ANDROID_CHARGER = "android_charger"
const val INFINITE_WATER_SOURCE = "infinite_water_source" const val INFINITE_WATER_SOURCE = "infinite_water_source"
const val DEV_CHEST = "dev_chest" 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 BLACK_HOLE_GENERATOR = "black_hole_generator"
const val MATTER_INJECTOR = "matter_injector" const val MATTER_INJECTOR = "matter_injector"
const val ANTIMATTER_INJECTOR = "antimatter_injector" const val ANTIMATTER_INJECTOR = "antimatter_injector"