hotfix, blame past me

This commit is contained in:
nikky 2018-05-10 00:56:28 +02:00
parent c3b6459738
commit fd7fd69306
6 changed files with 22 additions and 5 deletions

View File

@ -32,7 +32,8 @@ shadowJar {
classifier '' classifier ''
dependencies { dependencies {
include(project(":core")) include project(":core")
include project(":api")
} }
exclude 'dummyThing' exclude 'dummyThing'

View File

@ -31,7 +31,8 @@ shadowJar {
classifier '' classifier ''
dependencies { dependencies {
include(project(":core")) include project(":core")
include project(":api")
} }
exclude 'dummyThing' exclude 'dummyThing'

View File

@ -31,8 +31,9 @@ shadowJar {
classifier '' classifier ''
dependencies { dependencies {
include(project(":core")) include project(":core")
} include project(":api")
}
exclude 'dummyThing' exclude 'dummyThing'
} }

View File

@ -28,6 +28,7 @@ configurations {
dependencies { dependencies {
shade project(":core") shade project(":core")
shade project(":api")
} }
minecraft { minecraft {

View File

@ -8,6 +8,11 @@ buildscript {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }
} }
plugins {
id "com.github.johnrengelman.shadow" version "1.2.4"
}
apply plugin: 'kotlin' apply plugin: 'kotlin'
sourceCompatibility = targetCompatibility = '1.8' // Need this here so eclipse task generates correctly. sourceCompatibility = targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
@ -28,4 +33,12 @@ compileKotlin {
kotlinOptions { kotlinOptions {
jvmTarget = "1.8" jvmTarget = "1.8"
} }
}
shadowJar {
classifier ''
dependencies {
include project(":api")
}
} }

View File

@ -5,7 +5,7 @@ import matterlink.api.ApiMessage
import matterlink.api.MessageHandler import matterlink.api.MessageHandler
import matterlink.mapFormat import matterlink.mapFormat
object MessageHandlerInst : MessageHandler() object MessageHandlerInst: MessageHandler()
fun ApiMessage.format(fmt: String): String { fun ApiMessage.format(fmt: String): String {
return fmt.mapFormat( return fmt.mapFormat(