diff --git a/1.10.2/build.gradle b/1.10.2/build.gradle index 3cead20..f39840a 100644 --- a/1.10.2/build.gradle +++ b/1.10.2/build.gradle @@ -32,7 +32,8 @@ shadowJar { classifier '' dependencies { - include(project(":core")) + include project(":core") + include project(":api") } exclude 'dummyThing' diff --git a/1.11.2/build.gradle b/1.11.2/build.gradle index 7c24a1a..7e4bc27 100644 --- a/1.11.2/build.gradle +++ b/1.11.2/build.gradle @@ -31,7 +31,8 @@ shadowJar { classifier '' dependencies { - include(project(":core")) + include project(":core") + include project(":api") } exclude 'dummyThing' diff --git a/1.12.2/build.gradle b/1.12.2/build.gradle index 060a6fa..b3d4791 100644 --- a/1.12.2/build.gradle +++ b/1.12.2/build.gradle @@ -31,8 +31,9 @@ shadowJar { classifier '' dependencies { - include(project(":core")) - } + include project(":core") + include project(":api") + } exclude 'dummyThing' } diff --git a/1.7.10/build.gradle b/1.7.10/build.gradle index 6907390..882c360 100644 --- a/1.7.10/build.gradle +++ b/1.7.10/build.gradle @@ -28,6 +28,7 @@ configurations { dependencies { shade project(":core") + shade project(":api") } minecraft { diff --git a/core/build.gradle b/core/build.gradle index f71422c..f1e7861 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -8,6 +8,11 @@ buildscript { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } + +plugins { + id "com.github.johnrengelman.shadow" version "1.2.4" +} + apply plugin: 'kotlin' sourceCompatibility = targetCompatibility = '1.8' // Need this here so eclipse task generates correctly. @@ -28,4 +33,12 @@ compileKotlin { kotlinOptions { jvmTarget = "1.8" } +} + +shadowJar { + classifier '' + + dependencies { + include project(":api") + } } \ No newline at end of file diff --git a/core/src/main/kotlin/matterlink/bridge/MessageHandlerInst.kt b/core/src/main/kotlin/matterlink/bridge/MessageHandlerInst.kt index 2222d8a..be4ffc7 100644 --- a/core/src/main/kotlin/matterlink/bridge/MessageHandlerInst.kt +++ b/core/src/main/kotlin/matterlink/bridge/MessageHandlerInst.kt @@ -5,7 +5,7 @@ import matterlink.api.ApiMessage import matterlink.api.MessageHandler import matterlink.mapFormat -object MessageHandlerInst : MessageHandler() +object MessageHandlerInst: MessageHandler() fun ApiMessage.format(fmt: String): String { return fmt.mapFormat(